4c66f666cb
Merge pull request #3425 from Giacom/fix_magboots
...
Fixed magboots requiring to be turned on and off to correctly set NOSLIP...
2014-04-15 14:09:10 -05:00
75919440d6
Merge pull request #3412 from Giacom/someone_was_lazy
...
Fixed the lazy "fix" which caused mobs that Login or Logout to lose their hotkey mode.
2014-04-15 11:24:07 -05:00
71cd05cf49
Merge pull request #3393 from Razharas/GrabPull
...
Added datum mutations
2014-04-15 10:27:31 -05:00
dac4393fc4
Merge pull request #3404 from Aranclanos/lizardssss
...
Mutant race character preferences.
2014-04-15 09:59:06 -05:00
aa3a290cf2
Even more refactoring.
2014-04-14 22:51:37 +01:00
ab0c6f9c58
Fixed magboots requiring to be turned on and off to correctly set NOSLIP; was caused by flags being null, instead of 0.
...
Refactor'd the magboot code to be more elegant.
2014-04-14 22:35:32 +01:00
75246052a3
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-15 01:24:51 +04:00
40c349c052
A little tweak
2014-04-15 01:24:36 +04:00
229aaeb1a1
Updates the magboots file to Gia's changes.
2014-04-13 13:37:59 -05:00
9280e1410f
Fixes cyborgs spawning as ghosts.
2014-04-13 13:04:36 +01:00
ffe7f6d4a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-13 00:04:51 +04:00
a250e5f670
More !!FUN!!
...
Im open to discussion as to remove some of the TOO op mutations
2014-04-13 00:04:41 +04:00
16ae0d9f0d
Fixed the lazy "fix" which caused mobs that Login or Logout to lose their hotkey mode; even when they transfer to another mob.
2014-04-12 20:49:56 +01:00
1366822ec7
Lets Sci make magboots!
2014-04-12 13:53:06 -05:00
da977a79e2
Adds the advanced magboots.
2014-04-12 13:51:06 -05:00
84bb0f338c
Removes the extra dark vision of lizards
2014-04-11 21:18:49 -03:00
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
1d25935a47
Merge pull request #3294 from RandomMarine/sprayvars
...
Spray bottle tweaks and additions.
2014-04-11 23:08:55 +01:00
6e641397bf
Message fix
2014-04-11 02:31:52 +04:00
d26e1ee5ac
Fastfix of name
2014-04-11 02:28:41 +04:00
cae9fa555d
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-11 01:36:49 +04:00
cb5eaf0b10
Tweaks and giggles
2014-04-11 01:36:38 +04:00
050b1cbf73
Merge pull request #3376 from VistaPOWA/point_blank
...
Adds point blank shooting
2014-04-10 16:03:55 -05:00
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
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
31d851d315
Such vines
...
So mutation
2014-04-10 07:51:20 +04:00
910dae4154
Make reenter-corpse not delete your spells
2014-04-09 13:10:48 -07:00
31cfe0ba80
Merge pull request #3378 from Donkie/jobrefactor
...
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
30bb6c8814
Generalised ID naming
2014-04-09 18:49:59 +02:00
6c668c7c7b
Generalised PDA naming
2014-04-09 18:43:29 +02:00
eb77aa6871
Merge pull request #3365 from Firecage/master
...
Standardised and Sensible circuitboard design names
2014-04-09 09:37:02 -07:00
bd4156f18c
Adds missing newline
2014-04-09 15:08:51 +02:00
ef5fed5aa0
mergending
2014-04-09 15:07:06 +02:00
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
eec07e23f7
Merge pull request #3355 from Ikarrus/mineralstorage
...
Mineral Storage Access
2014-04-08 09:53:28 -07:00
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
aad822768f
Sensible circuit design names
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-04-08 14:09:40 +02:00
3acd999080
Merge pull request #3329 from phil235/DisposalPipeFix
...
Disposal bin deconstruction fix
2014-04-08 02:04:51 -05:00
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
42308da24d
Merge pull request #3298 from Kelenius/hydrofix
...
Fixing banana peel
2014-04-07 18:39:53 -07:00
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
73e8731f5b
Standardizing circuitboard design names
2014-04-07 23:01:56 +02:00
c9bd6c3688
Merge pull request #3296 from Ikarrus/alarmdelay
...
Alarm Delay Reduction
2014-04-07 14:04:50 -05:00
8a9a1c3260
Merge pull request #3289 from Firecage/master
...
Morphing Clown Mask!
2014-04-07 11:10:26 -07:00
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
3531c1d169
Merge branch 'master' of git://github.com/tgstation/-tg-station
2014-04-07 19:01:35 +02:00
d0dc3f3af4
Merge pull request #3330 from phil235/Biogeneratorfix
...
Add message when loading container into the biogenerator
2014-04-07 05:00:01 -05:00
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
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
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
Cheridan
Giacomand
Razharas
GunHog
Aranclanos
fleure
Miauw62
Jordie0608
MrPerson
Daniel
Razharas
VistaPOWA
Firecage
ikarrus
iamgoofball