cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,432 Commits 61 Branches 14 Tags
2da47fbb79ee3efed6fe39b7fd72643a167bb154
Commit Graph

4926 Commits

Author SHA1 Message Date
Aranclanos
2da47fbb79 Adds mutant races to the character preferences. It can only choose between lizard and human right now. 
Adds a new server configuration to toggle on and off the mutant races preferences. If it's off, everyone will be human.
 2014-04-11 21:10:27 -03:00
Cheridan
050b1cbf73 Merge pull request #3376 from VistaPOWA/point_blank 
Adds point blank shooting
 2014-04-10 16:03:55 -05:00
Miauw62
d783bccb6e Merge pull request #3383 from MrPerson/qdel_spells_TAKE_TWO 
Make reenter-corpse not delete your spells
 2014-04-10 21:55:17 +02:00
Jordie0608
b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
 2014-04-11 02:51:07 +10:00
MrPerson
910dae4154 Make reenter-corpse not delete your spells 2014-04-09 13:10:48 -07:00
Cheridan
31cfe0ba80 Merge pull request #3378 from Donkie/jobrefactor 
Jobcode refactoring TAKE TWO
 2014-04-09 13:52:37 -05:00
Daniel
30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Daniel
6c668c7c7b Generalised PDA naming 2014-04-09 18:43:29 +02:00
Razharas
eb77aa6871 Merge pull request #3365 from Firecage/master 
Standardised and Sensible circuitboard design names
 2014-04-09 09:37:02 -07:00
VistaPOWA
bd4156f18c Adds missing newline 2014-04-09 15:08:51 +02:00
VistaPOWA
ef5fed5aa0 mergending 2014-04-09 15:07:06 +02:00
VistaPOWA
e4e7331399 Adds point-blank shooting 
Adds point blank shooting, now you can shoot anyone even if they are on
the same tile or one tile from you. On harm intent, you BUTT-STROKE or
PISTOL WHIP (military terms!!) people with the gun, allowing for not
quite harmful floggings.

Makes gun.dm less shit.
 2014-04-09 15:02:33 +02:00
Razharas
eec07e23f7 Merge pull request #3355 from Ikarrus/mineralstorage 
Mineral Storage Access
 2014-04-08 09:53:28 -07:00
Miauw
5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/_onclick/telekinesis.dm
 2014-04-08 14:29:58 +02:00
Firecage
aad822768f Sensible circuit design names 
Signed-off-by: Firecage <firecage@hotmail.com>
 2014-04-08 14:09:40 +02:00
Cheridan
3acd999080 Merge pull request #3329 from phil235/DisposalPipeFix 
Disposal bin deconstruction fix
 2014-04-08 02:04:51 -05:00
Razharas
03b34893d5 Merge pull request #3343 from Giacom/small_fixes 
Fixes being able to change your chameleon jumpsuit's colour while dead.
 2014-04-07 18:48:05 -07:00
Razharas
42308da24d Merge pull request #3298 from Kelenius/hydrofix 
Fixing banana peel
 2014-04-07 18:39:53 -07:00
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
Firecage
73e8731f5b Standardizing circuitboard design names 2014-04-07 23:01:56 +02: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
ikarrus
ae4a5482f0 Mineral Storage Access 
Mineral Storage gives you access to the ore redemption machine, instead of keeping a list of req_one_access for various jobs. The intention is to make it easier to manage accesses and make it more clear who could use the machine.

Miners and their superiors now have access to the machine. If this becomes an issue I can adjust it.

Relabeled Mineral Storeroom access to Mineral Storage since the storeroom doesn't exist any more.
 2014-04-06 15:40:46 -06: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
Giacomand
ce8baeabb9 Fixes being able to change your chameleon jumpsuit's colour while dead. 
Fixed an oversight with the red syndicate suits in the random uplink kit.
 2014-04-06 15:16:22 +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
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
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
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
phil235
21cb80b79e fixing CP var 2014-04-05 17:35:12 +02:00
phil235
d07450ad47 Adds message at end of pipe slicing 
* Adds message at the end of pipe slicing operation.
* Simplify code checking if player/tool moves during pipe slicing.
* adds span class everywhere.
 2014-04-05 17:22:04 +02:00
phil235
5a6e9804b9 Bin&outlet can be deconstructed even with destroyed trunk 
Fixes the bug where you can't deconstruct the bin/outlet after the trunk below it has been destroyed (usually by an explosion) and you can't replace the trunk with the bin/outlet in the way.
 2014-04-05 16:44:22 +02: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
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
Kelenius
b7243b94c1 Fixing banana peel 2014-04-03 16:00:07 +04:00
Razharas
1098b7e498 Merge branch 'master' of https://github.com/tgstation/-tg-station into RDfix 2014-04-03 15:38:07 +04:00