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

9160 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
69d4f658d2 Emergency fix to make the code compile. 
I'm so sorry ;_;
 2014-04-10 22:03:28 +02: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
Miauw62
8c2b5bf29a Merge pull request #3367 from MrPerson/qdel_telecomms 
Make Telecomms equipment garbage collect
 2014-04-10 17:05:02 +02: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
c74edd9b42 MEIN GESPANNEN 2014-04-09 20:24:58 +02:00
Daniel
dd493117a7 Fixed merge conflict issues 2014-04-09 19:19:36 +02:00
Miauw62
fde4cfe4fd Merge pull request #3323 from Ikarrus/signalorigin 
Emergency Shuttle Signal Tracing
 2014-04-09 18:51:18 +02:00
Daniel
30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Daniel
03c1d7f673 Removed debugging code 2014-04-09 18:46:12 +02:00
Daniel
cd161aa6c0 Job refactoring done 2014-04-09 18:46:00 +02:00
Daniel
2a841c6dff Further work on job refactoring 2014-04-09 18:43:30 +02:00
Daniel
67cd5fa847 Start of large job refactoring 2014-04-09 18:43:29 +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
Steelpoint
35950b90fd SecMapChangeV3 2014-04-09 19:17:11 +08:00
Razharas
f44e3ffbf1 Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14 
More qdel() changes
 2014-04-08 15:37:44 -07:00
Razharas
eec07e23f7 Merge pull request #3355 from Ikarrus/mineralstorage 
Mineral Storage Access
 2014-04-08 09:53:28 -07:00
Ikarrus
81187c4243 Reverted Bartender Changes 2014-04-08 08:40:23 -06:00
Miauw62
6b19ab982a Merge pull request #3361 from Perakp/tiny_prick_fix 
Changeling bug fixes
 2014-04-08 14:57:08 +02:00
Aranclanos
77829dbc9a Merge pull request #3035 from Miauw62/warnstandardization 
Standardizes and expands the warning() and error() procs.
 2014-04-08 09:51:10 -03:00
Miauw62
c633d2e197 Merge pull request #3327 from Malkevin/gamemodedebug 
Fixes my gamemode debugger
 2014-04-08 14:49:39 +02:00
Miauw62
b97a61c11f FUCK YOU GIITTTT ;_; 2014-04-08 14:47:05 +02: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
MrPerson
dd8891ef35 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14 
Conflicts:
	code/game/machinery/camera/camera.dm
 2014-04-08 04:53:05 -07:00
MrPerson
2891713637 Make Telecomms equipment garbage collect 2014-04-08 04:30:09 -07:00
Cheridan
3acd999080 Merge pull request #3329 from phil235/DisposalPipeFix 
Disposal bin deconstruction fix
 2014-04-08 02:04:51 -05:00
Cheridan
bea449125b Merge pull request #3354 from Ikarrus/doorelectronics 
Updated the godawful Airlock Electronics interface
 2014-04-08 01:44:37 -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
862f76c85f Merge pull request #3331 from Giacom/danerfs 
Nerf stats to the Genetic Power symptom.
 2014-04-07 18:47:27 -07:00
Razharas
1b2e14eaa1 Merge pull request #3305 from Aranclanos/DoubleAgentsFinalWording 
Double agents round-end message small change.
 2014-04-07 18:41:17 -07:00
Razharas
4b57246f2c Merge pull request #3300 from Ikarrus/renamenotice 
Cyborgs notified of master AI renames
 2014-04-07 18:40:38 -07:00
Razharas
42308da24d Merge pull request #3298 from Kelenius/hydrofix 
Fixing banana peel
 2014-04-07 18:39:53 -07:00
Razharas
09c04a70c2 Merge pull request #3288 from phil235/ComputerBuildFix 
Adds some messages during computer construction steps
 2014-04-07 18:37:07 -07:00
Razharas
ac72bcaa37 Merge pull request #3283 from Aranclanos/Blueprints 
Fixes blueprints not being able to generate a second area.
 2014-04-07 18:36:36 -07:00
Razharas
c40458ab03 Merge pull request #3271 from GunHog/Cams_Upgrade 
Replaces the carrot with the analyzer for upgrading cameras, also makes them easier to upgrade.[WIP]
 2014-04-07 18:35:42 -07:00
Razharas
00c9e92b82 Merge pull request #3268 from Limeliz/patch-5 
Fixes #3263/telekinetic grab showing up on examine
 2014-04-07 18:33:51 -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