cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 23:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,334 Commits 61 Branches 14 Tags
4e7ac41ba405e6ec63da5e5ce749377cfc4dc1fa
Commit Graph

9079 Commits

Author SHA1 Message Date
Razharas
4e7ac41ba4 Merge pull request #3346 from Iamgoofball/FUCKMONKEY 
Removes a bunch of ticker.mode.name == "monkey" checks, since monkey doesn't even exist anymore
 2014-04-07 18:30:30 -07:00
Cheridan
c9bd6c3688 Merge pull request #3296 from Ikarrus/alarmdelay 
Alarm Delay Reduction
 2014-04-07 14:04:50 -05:00
Razharas
8a9a1c3260 Merge pull request #3289 from Firecage/master 
Morphing Clown Mask!
 2014-04-07 11:10:26 -07:00
Cheridan
417a4ed070 Merge pull request #3333 from Giacom/config_allow_ooc 
Added a configuration option that disables OOC during the round automatically.
 2014-04-07 12:14:53 -05:00
Firecage
3531c1d169 Merge branch 'master' of git://github.com/tgstation/-tg-station 2014-04-07 19:01:35 +02:00
Cheridan
d0dc3f3af4 Merge pull request #3330 from phil235/Biogeneratorfix 
Add message when loading container into the biogenerator
 2014-04-07 05:00:01 -05:00
Cheridan
a9b24e42ab Merge pull request #3342 from Giacom/emag_borgy 
Fixes a bug with Cyborgs losing their emag module...
 2014-04-06 21:47:55 -05:00
iamgoofball
810b91e7ac removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists. 2014-04-06 11:46:12 -07:00
fleure
9db94d7c98 Merge pull request #3314 from Steelpoint/WaterTank 
Increase's jani water tank's starting space cleaner supply
 2014-04-06 17:16:06 +01:00
Giacomand
e41dd607b5 Better comment. 2014-04-06 14:27:28 +01:00
Giacomand
cb4e338318 Fixes a bug with Cyborgs losing their emag module if they were emagged as a default cyborg and they transform. 2014-04-06 14:07:09 +01:00
ikarrus
306dae728f Renamed Misc Lab to Testing Lab 2014-04-06 02:30:10 -06:00
Giacomand
c67334c929 Added a configuration option that disables OOC during the round automatically. Defaults to allowing OOC during the round. 2014-04-05 19:41:47 +01:00
Miauw62
447bf56908 Merge pull request #3313 from Aranclanos/FalseWalls 
Works with falsewalls and plasma asay logs.
 2014-04-05 20:20:51 +02:00
Aranclanos
53026a2483 Fixed the feedback messages for when you try to make a false wall with insufficient sheets. 
Merged the open/close close from false walls walls and reinforced false walls into one.
 2014-04-05 15:03:27 -03:00
Miauw62
95733ee3ea Merge pull request #3280 from MrPerson/mining_vouchers 
Fix the "use mining voucher many times" bug
 2014-04-05 19:00:35 +02:00
Miauw62
ab181299dd Merge pull request #3279 from fleure/braid 
Fixes floorlength braid sprite
 2014-04-05 18:48:02 +02:00
Miauw62
39a077761c Merge pull request #3264 from Menshin/Wizarditis_and_inv 
Fixed "update inventory X" procs and clothes from wizarditis not showing
 2014-04-05 18:43:40 +02:00
Miauw62
0cb799faa6 Merge pull request #3292 from Krypt0n33/newscaster-fix 
Fixes #3290
 2014-04-05 18:25:40 +02:00
Miauw62
732e02d393 Merge pull request #3302 from MrPerson/qdel_runtime_disposal 
Fixes for a disposal runtime everytime something got flushed
 2014-04-05 18:09:04 +02:00
Miauw62
9bdb8b0e96 Merge pull request #3309 from Krypt0n33/human-burger-fix-2 
Fixes #3293
 2014-04-05 18:04:41 +02:00
phil235
b095a3458c one missing period. derp 2014-04-05 18:02:40 +02:00
phil235
2a3924820f Add message when loading container. 
* Add message when loading container.
* Change 'beaker' to 'container' (to include buckets)
 2014-04-05 18:00:04 +02:00
Miauw62
52ecffde76 Merge pull request #3306 from Aranclanos/DisposalAir 
Fixes issue #2330. Disposals not activating the turf air.
 2014-04-05 17:59:19 +02:00
Rockdtben
f6906addb2 Merge pull request #3285 from Steelpoint/JaniBelt 
Adds the janibelt!
 2014-04-04 08:10:21 -05:00
Steelpoint
3fe2530086 Fix 2014-04-04 21:06:30 +08:00
Steelpoint
0f3acabbaa AmountChange 2014-04-04 20:40:12 +08:00
Aranclanos
7c93c1229f Removed a spawn() from the Destroy() proc of falsewalls. 
Removed the falserwall type, now reinforced walls are a subtype of falsewalls.
Due to that, removed a bunch of copypasted code.
Falsewalls now spawn closed.
Falsewalls open/close timers are now proper, regarding their animation times.
You can't use a screwdriver on falsewalls while they aren't on a floor. (excluding shuttle floors)
Fixes issue #2338
Plasma falsewalls will now ignite.
Added a feedback message when you don't have enough sheets to create a falsewall.
Admin logs for igniting plasma walls, falsewalls, doors and airlocks.
Stadarized mineral_doors.dm.
 2014-04-04 09:18:39 -03:00
Razharas
5626ad9bbc Merge pull request #3275 from Aranclanos/TeleportersFix 
Fixes and some minor changes regarding teleports/portals code.
 2014-04-03 22:05:45 -07:00
Krypt0n
aa80ee0f29 human-burgers now eject correctly 2014-04-03 22:50:02 +02:00
Aranclanos
e3836fa43e Fixes issue #2330 
Makes disposal outlets activate the turf once they eject air to it.
 2014-04-03 16:07:40 -03:00
Miauw62
6748fafb52 Merge pull request #3248 from AnturK/nothinglikeasmellofplasmainthemorning 
Fix for freezing plasma from chemistry
 2014-04-03 20:43:17 +02:00
Miauw62
47c463d0b2 Merge pull request #3276 from MrPerson/play_me_a_song_piano_man 
Make violin stop cutting off other sounds
 2014-04-03 20:26:58 +02:00
MrPerson
a3016c8229 Fixes for a disposal runtime everytime something got flushed 2014-04-03 11:02:32 -07:00
Firecage
8b8bf8b690 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-03 17:48:04 +02:00
fleure
786656c712 Merge pull request #3262 from Razharas/RDfix 
Fixes R&D machinery materials adding exploit
 2014-04-03 15:52:38 +01:00
fleure
ec6934ec31 Merge pull request #3278 from Aranclanos/Mulebots 
Fixes issue #2316 Mulebots picking up crates through plastic flaps.
 2014-04-03 15:46:48 +01:00
Steelpoint
1f4ff7204c More ALterations 2014-04-03 21:13:03 +08:00
Steelpoint
23a7847705 Alterations 2014-04-03 21:12:09 +08:00
Razharas
1175d3e49c Merge pull request #3295 from Ikarrus/boxfix1 
[MAP] Minor Fixes to 2.1.3
 2014-04-03 04:44:24 -07:00
Razharas
1098b7e498 Merge branch 'master' of https://github.com/tgstation/-tg-station into RDfix 2014-04-03 15:38:07 +04:00
Razharas
f7e3737f3f Span classes yaaaaay 2014-04-03 15:37:53 +04:00
Razharas
39196c6941 Merge pull request #3115 from Ikarrus/borgnotice 
AIs are notified when a cyborg is slaved to it
 2014-04-03 04:14:31 -07:00
ikarrus
4b4ea8bab3 Fixed armory motion alarm not working 2014-04-02 22:58:18 -06:00
ikarrus
51769a1697 Alarm Delay Reduction 
Reduced motion alarm delay from 10 to 3 seconds.
Reduced alarm display delay from 10 to 3 seconds.

This means that motion cameras will only take 6 seconds to report an intruder instead of 20+
Other alarms (camera, fire, atmos) will be reported after 3 seconds instead of 10.
 2014-04-02 22:47:22 -06:00
ikarrus
f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
Cheridan
4dc2ccce1f Merge pull request #3266 from phil235/FireAxeCabineFix 
Fireaxe cabinet hacking now fails if player moves away
 2014-04-02 21:26:37 -05:00
ikarrus
f705141fce Resolved Conflicts: 
code/datums/wires/robot.dm
 2014-04-02 20:23:31 -06:00
Razharas
5b815c8d01 Merge pull request #3267 from Cheridan/Singu 
Improved Singularity Ex_act()
 2014-04-02 16:52:15 -07:00
Krypt0n
235ff6182b There is no need to be ups...sanitize twice 
channels were already sanitized when they were inputed
 2014-04-03 01:34:10 +02:00