cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 21:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,845 Commits 61 Branches 14 Tags
a4e4e2bcce7cfe8a01790ff30b1e45c76f3b384b
Commit Graph

2837 Commits

Author SHA1 Message Date
Miauw62
a0279416f1 Merge pull request #3647 from Jordie0608/msoisatheifhalthalthalthalt 
Changed mining equipment locker to mining equipment vendor
 2014-05-07 17:25:22 +02:00
Cheridan
bd2756c36a Merge pull request #3580 from argoneuscze/fixshowerfire 
Fix shower not extinguishing fires
 2014-05-06 19:46:57 -05:00
Alex
5d39b2f5c2 Merge pull request #3524 from phil235/ShardFeetFix 
Fix for stepping on shard
 2014-05-06 20:01:10 +01:00
Jordie0608
6530150120 Changed mining equipment locker to mining equipment vendor 2014-05-06 20:01:01 +10:00
Cheridan
9ae36480b2 Merge pull request #3618 from kyrahabattoir/ItemNameFixingRound4 
More name fixing, lowercasing objects, proper-ing unique objects, plural...
 2014-05-05 11:46:35 -05:00
Razharas
282a5d3a2b Merge pull request #3379 from Cheridan/sliceofpai 
Refactors pAI law code...
 2014-05-05 07:33:17 -07:00
Alex
6d337e760b Merge pull request #3592 from Aranclanos/reisinsuperconductivity 
Reisin walls and doors will now block superconductivity (heat)
 2014-05-03 23:11:13 +01:00
Miauw62
5e6d59d95f Merge pull request #3605 from phil235/DualsaberSoundFix 
Fixes the lack of hitsounds for the dualsaber.
 2014-05-03 16:30:09 +02:00
Miauw62
eec72aa516 Merge pull request #3472 from Menshin/missing_nodrop 
Nodrop  checks for several machines/structures
 2014-05-03 15:44:26 +02:00
Alex
09f112c9cb Merge pull request #3572 from Aranclanos/evidencebags 
Heil myself
 2014-05-02 17:46:04 +01:00
Alex
64073f0a8d Merge pull request #3489 from Aranclanos/ChemGrenades 
Chem grenades asay logs improvements
 2014-05-02 17:45:11 +01:00
Alex
b3b54d2561 Merge pull request #3607 from phil235/WindowDestroySoundFix 
Fixes the lack of sound when smashing window
 2014-05-02 17:40:37 +01:00
Kyrah Abattoir
997e1310c5 More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it. 2014-05-01 23:07:35 +02:00
phil235
0233cd3a25 Fixes the lack of sound when smashing window 2014-05-01 01:43:09 +02:00
phil235
19734b93cc Fixes the lack of hitsounds for the dualsaber. 2014-04-30 23:37:31 +02:00
Aranclanos
cc34aae3e3 Reisin walls and doors will now block superconductivity (heat) 
Reisin membranes won't
 2014-04-30 07:40:41 -03:00
argoneus
d08c9ebc08 Fixed #3571 2014-04-29 21:38:38 +02:00
Aranclanos
129401c403 evidence bags will now use attackby() to add items to themselves 
removed the preattack() proc
 2014-04-29 08:38:51 -03:00
VistaPOWA
19402bd258 Handle alpha 0 2014-04-27 15:57:18 +02:00
VistaPOWA
fcf98c15f9 Checking for divide by zero 2014-04-27 14:41:53 +02:00
VistaPOWA
4c7cbeff08 Fixes bad indent 2014-04-27 14:34:52 +02:00
VistaPOWA
14ad291ba2 Merge remote-tracking branch 'upstream/master' into smoke_fade 2014-04-27 14:16:55 +02:00
VistaPOWA
5a197e8dec Adds a fancy fade-out for smokes 
Originally from Bay.
Made by Loganbacca, ported by me.
 2014-04-27 14:16:50 +02:00
phil235
aa2c65aaf4 removing some of my code 2014-04-25 20:44:32 +02:00
Cheridan
a081d487f7 Merge pull request #3424 from Nnelg/Polymorphic-can_equip 
Polymorphic can_equip
 2014-04-24 23:13:58 -05:00
Cheridan
686e879f2e Merge pull request #3490 from Giacom/fixes_transit_tubes 
Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
 2014-04-24 23:07:52 -05:00
Cheridan
892cf5b191 Merge pull request #3505 from MrPerson/who_cleans_those_who_clean_us 
Runtime fix for the mop
 2014-04-24 20:48:52 -05:00
phil235
ff95095446 Fix for shard 2014-04-25 01:11:29 +02:00
MrPerson
d56e0c6d04 var rename. Gia's right, this was kinda confusing 2014-04-23 15:11:59 -07:00
fleure
a3b01d017e Merge pull request #3495 from phil235/CocoonattackedmsgFix 
Fix for #3151
 2014-04-23 15:12:38 +01:00
fleure
47a23e1465 Merge pull request #3456 from phil235/TrayPinMsgFix 
Fixing rolling pin/tray attack stuff
 2014-04-23 14:52:58 +01:00
MrPerson
2841124d29 Runtime fix for the mop 
The following runtime has occured 40 time(s).
runtime error: Cannot execute null.clean blood().
proc name: clean (/obj/item/weapon/mop/proc/clean)
  source file: mop.dm,22
  usr: Xavier Paynter (/mob/living/carbon/human)
  src: the mop (/obj/item/weapon/mop)

Cause: Someone would mop the same vomit/whatever more than once. The first clean would qdel() the vomit, which resulted in the vomit's loc being null. The subsequent moppings would continue and eventually try to call vomit.loc.clean_blood().
 2014-04-22 12:52:33 -07:00
Cheridan
b441e34d14 Merge pull request #3390 from Ikarrus/deptmanagement 
Heads may use ID Modification Consoles to manage their department
 2014-04-21 22:51:57 -05:00
Cheridan
c3a3d00f82 Merge pull request #3470 from Giacom/default_wiki 
Changed the default wiki to tgstation13.org/wiki.
 2014-04-21 21:56:52 -05:00
Giacomand
d42aa1e28a Fixes a typo. 2014-04-21 21:00:23 +01:00
phil235
382397a6ea Fix for #3151 
Removes the useless periods.
 2014-04-21 19:36:33 +02:00
Cheridan
7c4ea04c36 Merge pull request #3478 from Jordie0608/unfastedagirlwhatdo 
Fixed typo in grille fastening
 2014-04-21 12:20:49 -05:00
Giacomand
016889bfc0 Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop. 
Segmented the transit tube code into its own folder and code files, for each part of the tube.
 2014-04-21 15:44:50 +01:00
Aranclanos
169a61b026 Makes fingerprintslast use ckey instead of key 
Cleans a bit the prime() code, large grenades won't be a huge copypaste anymore
Asay logs will now show up when the grenade is activated instead of used. Only when The grenade is activated by an assembly.
New proc, get_mob_by_ckey(). Give it a ckey and it will return a mob.
 2014-04-21 10:57:56 -03:00
Jordie
10ea2eb771 Fixed typo in grille fastening 2014-04-21 11:21:45 +10:00
Menshin
80e7d1d0e7 Added a check for "_nodrop_" items for several machines/structures (fix #3407). 2014-04-20 20:49:32 +02:00
Giacomand
d1b0a76eae Changed the default wiki to tgstation13.org/wiki. 
Changed the wiki url format to work with the manuals, you can change the config if there are extra parameters, like title.
Fixed the telescience manual not linking to the telescience guide.
 2014-04-20 19:20:33 +01:00
phil235
57bba34352 missed a parenthesis 2014-04-19 21:12:10 +02:00
phil235
7314993d76 Fixing rolling pin/tray attack stuff 
* simplify the attack code.
* fix messages and lack of sound when attacking with the rolling pin.
* rolling pin and tray will now use their attack verbs hopefully.
 2014-04-19 20:53:45 +02:00
Menshin
a2a154aca9 Fixes for (#3441). 2014-04-19 14:02:37 +02:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Cheridan
440039f0a2 Merge pull request #3429 from Giacom/fix_manuals 
Fixes manuals being unreadable.
 2014-04-16 14:31:52 -05:00
ikarrus
5f5a470fe9 Merge branch 'master' of https://github.com/tgstation/-tg-station into steelpointcleanup 
Resolved Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-04-15 21:10:00 -06:00
Cheridan
a8c5e2ea24 Merge pull request #3389 from Ikarrus/notifyfix 
Fixed AI not being notified of new roboticist-built cyborgs slaved to it
 2014-04-15 14:15:43 -05:00
Giacomand
3a6672b639 Fixes manuals being unreadable. 2014-04-15 18:37:48 +01:00