cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,385 Commits 62 Branches 14 Tags
245dc528338eafd6ccd540f856423ebbda012f7d
Commit Graph

1232 Commits

Author SHA1 Message Date
Giacom
c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor 
Optimized and refactored list2text, text2list, and replacetext.
 2014-01-11 10:11:13 -08:00
YotaXP
cb0516f909 Corrected my own grammar failings. 2014-01-11 12:51:42 -05:00
Giacom
c1d228a96e Merge pull request #2282 from Cheridan/Magic 
Upgradeable Laser Pointers!
 2014-01-11 06:09:19 -08:00
Giacom
7b5e401ee6 Merge pull request #2275 from JJRcop/nuke-toy 
Adds new nuke toy
 2014-01-11 04:22:20 -08:00
Cheridan
c10d9b2611 fixing my fixes 2014-01-10 14:10:30 -06:00
Cheridan
397b2f07e8 fixes 2014-01-08 10:42:12 -06:00
JJRcop
0ef530326a Minor nuke toy edit 
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
 2014-01-08 09:52:00 -05:00
YotaXP
f98a57b750 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.
 2014-01-07 22:15:25 -05:00
Cheridan
937ac275ff Upgradeable Laser Pointers! 
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
 2014-01-07 19:54:51 -06:00
JJRcop
01f229a60d Adds "surround" arg to playsound, which enables 3D sound 
Defaulted to on
Also changes the toy nuke to use it
 2014-01-07 17:45:12 -05:00
Cheridan
afd6b5fa22 Merge pull request #2266 from fleure/janradio 
Gives janitor service headset
 2014-01-07 08:37:24 -08:00
JJRcop
1300e3ebf3 Adds a visible_message to the nuke toy when it is used 2014-01-07 11:20:19 -05:00
Cheridan
1a58a3cf86 Merge pull request #2265 from fleure/watertank 
Reduced watertank slowdown slightly
 2014-01-07 08:16:10 -08:00
Giacom
9602bd2c14 Merge pull request #2256 from Aranclanos/RRpls 
Half of the runtimes of four days here
 2014-01-07 06:24:57 -08:00
Cheridan
58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables 
Poker tables
 2014-01-06 14:35:03 -08:00
JJRcop
94ef52e1cd Adds new nuke toy, plays nuke sound when attack_self'd 
Cooldown of 5 minutes
 2014-01-06 16:46:12 -05:00
Fleure
c50255107a Gives janitor service headset 2014-01-06 18:51:22 +00:00
Fleure
333d0ed045 Reduced watertank slowdown slightly 2014-01-06 18:26:06 +00:00
Aranclanos
233a5b3b9b Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs. 2014-01-06 06:34:17 -03:00
AndroidSFV
fe6f217d6f Adds logging to emagged borgs using their stun arm. 2014-01-04 04:00:16 -06:00
Giacom
09da906881 Merge pull request #2187 from Tenebrosity/newradiofrequencycolours 
Adds new radio frequency colours
 2014-01-02 10:41:09 -08:00
Cheridan
3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192 
Conflicts:
	code/modules/clothing/head/misc.dm
 2014-01-02 10:00:58 -06:00
fleure
be0f52b623 Fixed bruisepacks not working 2013-12-31 17:06:34 +00:00
Tenebrosity
b3d37e1d0a Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum. 2013-12-31 16:50:17 +13:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS* 
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
 2013-12-30 15:03:17 -06:00
Aranclanos
d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix 
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
 2013-12-30 10:23:54 -08:00
Tenebrosity
e4b251a488 Adds different radio frequency colours for engineering, security, medical, service and supply. 2013-12-30 20:09:35 +13:00
Robson Richards
d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs 
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
 2013-12-29 17:40:12 +00:00
Robson Richards
53bfd06609 Fixes #2180 - Augmented limb healing issues 2013-12-29 16:12:32 +00:00
Rockdtben
92636bbe01 Merge pull request #2168 from fleure/toolbox 
Fixed toolbox parent object giving error
 2013-12-29 08:00:11 -08:00
fleure
171147b1bf Fixed toolbox parent object giving error 2013-12-28 14:51:35 +00:00
Cluwnes Honk
2482fd0702 Makes cards pocketable. 
Adds w_classes to cards so you can actually pocket the things.
 2013-12-27 15:49:21 -08:00
Cheridan
b9efeaa932 Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3 
Item name fixing round3
 2013-12-26 23:14:15 -08:00
Cheridan
ef25332511 Merge pull request #2125 from Miauw62/ifitfeelsright 
Folding boxes updates sprites properly
 2013-12-26 20:13:09 -08:00
Miauw
0c8c6a5de2 Fixed #1119 folding boxes updates sprites properly 2013-12-22 19:21:45 +01:00
Miauw
0338a66c2a Adds fingerprints to a bunch of stuff. De-texts computer build paths. 2013-12-22 18:57:33 +01:00
Kyrah Abattoir
df626a1f06 correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2013-12-22 11:28:10 +01:00
Aranclanos
f00c80bd43 Merge pull request #2104 from Giacom/gulag_therevenge 
[MAP] The Gulag: The Revenge: Part 2.5
 2013-12-21 15:05:57 -08:00
Aranclanos
e7579e2aa8 Merge pull request #1986 from Perakp/janitorCartFix 
Fixes janiborg interaction with janicarts
 2013-12-21 15:01:37 -08:00
Giacom
516ec6076d Merge pull request #2102 from Razharas/Flamethrower 
Fixes flamethrowers shooting through stuff
 2013-12-21 13:57:33 -08:00
Giacom
9d24a900ae Merge pull request #2066 from Perakp/slipFix4 
No slipping when lying down
 2013-12-21 13:54:39 -08:00
Robson Richards
9dd0432697 Implements Gia's Superior Idea. 
fixes some directions on Nienhaus's sprites
 2013-12-21 20:09:52 +00:00
Robson Richards
b8d8975fe6 Fixes Kaze's Suggestion 
Standardises the fuck out of Table attackby's (NO COPYPASTA ANYMORE YAY)
Adds a new proc which does the above.
 2013-12-21 18:22:49 +00:00
Perakp
c40af6ae40 Update icons after item is placed in cart. 2013-12-21 09:50:15 +02:00
Perakp
65e0931d55 Merge branch 'master' into janitorCartFix 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
 2013-12-21 09:40:06 +02:00
Giacomand
47545f439e * Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox. 
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
 * Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
 * When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
 2013-12-20 22:09:06 +00:00
Razharas
ae6a4d9b18 Fixes flamethrowers shooting through stuff 
Fixed #2059
They need to be fixed more, but thats a theme for another PR
 2013-12-20 22:57:41 +04:00
Cheridan
0f016a054f Merge pull request #2078 from Razharas/train 
Fixes chameleon projector
 2013-12-19 21:54:17 -08:00
Aranclanos
0fdcd42592 Merge pull request #2054 from Cheridan/Nuke 
Nuke Ops Tweaks: Flamer and Mechas
 2013-12-19 13:37:32 -08:00
Perakp
2f70aaadb3 Removes magic numbers and an useless check 
- it shouldn’t runtime.
 2013-12-18 22:31:07 +02:00