Jordie
32932ae7d5
Merge pull request #11896 from KorPhaeron/forsaeg
...
Admin Verb: Offer Control
2015-09-22 12:26:23 +10:00
Jordie
01c362f069
Merge pull request #11757 from Xhuis/side_antagonist_tweaks
...
Side Antagonist Tweaks
2015-09-22 12:26:00 +10:00
KorPhaeron
86d7a15141
If this isn't actually fixed I'm gonna cry
2015-09-21 21:04:28 -05:00
KorPhaeron
039af4067e
Parentheses
2015-09-21 19:25:39 -05:00
KorPhaeron
403aac044b
compromise
2015-09-21 19:24:28 -05:00
KorPhaeron
ceb87b1d62
key_name_admin
2015-09-21 18:46:28 -05:00
KorPhaeron
4edb09064a
span
2015-09-21 17:31:07 -05:00
KorPhaeron
d4bf182366
Indent
2015-09-21 10:07:01 -05:00
KorPhaeron
d2ad29ad98
Removes useless code
2015-09-21 10:01:49 -05:00
KorPhaeron
12bc0caa3a
Updates pollCandidates
2015-09-21 09:45:28 -05:00
KorPhaeron
947787effd
Strange
2015-09-19 23:10:09 -05:00
KorPhaeron
644124923a
Offer Control
2015-09-19 23:03:19 -05:00
Remie Richards
9363a14d2f
Merge pull request #11743 from Delimusca/cleanconfusion
...
changes confusion to be less RNG garbage
2015-09-19 14:01:58 +01:00
Xhuis
01005f6b82
Prevents blood crawling with held items
2015-09-18 18:30:44 -04:00
Xhuis
67ca94c5fa
Merge remote-tracking branch 'remotes/upstream/master' into slaughter_demon_stuff
2015-09-18 16:54:13 -04:00
Xhuis
c0d3a67f0e
Side antagonist tweaks
2015-09-18 16:54:01 -04:00
Swag McYolosteinen
3ef5d02cee
Merge pull request #11689 from Steelpoint/RifleS
...
Security Weapon Overhaul: Auto Rifle Edition
2015-09-16 13:34:35 +02:00
Steelpoint
e51eefbe34
MoreChanges
2015-09-16 18:00:21 +08:00
Razharas
73db85100c
Merge pull request #11769 from phil235/FixMutations
...
Some dna fixes
2015-09-15 22:31:59 +03:00
Cheridan
037bce50c2
Merge pull request #11772 from xxalpha/fixthelathe
...
Fix autolathe rejecting stacks.
2015-09-15 08:01:59 -05:00
Cheridan
0a8690edf0
Merge pull request #11738 from Supermichael777/detomax
...
Buffs the detomax pda bomb by removing its RANDOM EXPLOSION MECHANIC.
2015-09-14 18:37:53 -05:00
phil235
2333eb6b55
Merge pull request #11763 from RemieRichards/FootprintTweaks
...
Footprint Tweaks
2015-09-14 20:50:23 +02:00
phil235
c9588662f7
Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after.
...
Simplifies mutation overlay updating code.
2015-09-14 00:58:25 +02:00
xxalpha
0a055f101a
Fix material container
2015-09-13 23:35:49 +01:00
phil235
428a28a440
Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
...
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
unknown
68b824e727
increased confusion multiplier, increased confusion sources
2015-09-13 12:39:41 -06:00
Remie Richards
4bb97067b2
Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints
2015-09-13 15:36:56 +01:00
Jordie
e718214a67
Merge pull request #11734 from Menshin/sheets_inserting_safety_checks
...
Adds boundary checks for stack sheets inserting
2015-09-13 23:13:04 +10:00
Steelpoint
5783cdda03
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
Jordie
15e50de0fe
Merge pull request #11694 from bear1ake/point-zero
...
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie
2ca388bf9f
Merge pull request #11696 from Shadowlight213/Edswarmfix
...
Modifies the Dispense Wizard Justice spell to correct some issues
2015-09-13 21:44:23 +10:00
Supermichael777
fc07017814
it still costs 6
2015-09-12 12:37:45 -04:00
Supermichael777
3be09cfbd2
lowers detomax cost
2015-09-12 12:19:46 -04:00
bear1ake
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Steelpoint
ae117c134b
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
code/game/jobs/job/security.dm
2015-09-12 18:43:15 +08:00
Menshin
ce2ee15b57
* Added boundary checks for stack sheets inserting ( fixes #11732 )
...
* Limited material inserting to stack sheets for the protolathe and banana shoes
2015-09-12 12:11:57 +02:00
Razharas
f9a01d1365
Merge pull request #11580 from xxalpha/protocontainer
...
Changed protolathe code to use material container.
2015-09-12 08:56:47 +03:00
Razharas
fbe1781374
Merge pull request #11609 from AnturK/outfits
...
Outfit datum
2015-09-12 08:56:12 +03:00
xxalpha
28889d2b6a
Changed protolathe code to use material container.
...
Clean proc, typo fix
Standard sheet values
2015-09-11 12:39:32 +01:00
Steelpoint
5a5bcbbbd7
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
code/game/gamemodes/changeling/powers/mutations.dm
2015-09-10 23:18:39 +08:00
Shadowlight213
ee5022baac
Sets Ed projectiles to lasers because Jordie demands justice be death
2015-09-10 05:50:48 -07:00
palpatine213
cde222b8b8
Adds a few vars to the Eds summoned by the wizard justice spell.
2015-09-10 05:26:41 -07:00
bear1ake
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
Steelpoint
6eac77fcfd
Rifle
2015-09-10 13:14:41 +08:00
Cheridan
304d91fa2c
Merge pull request #11606 from Firecage/gunnames
...
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
Firecage
b7cbf7f940
Just a name change to uplink items.
2015-09-09 17:38:22 +02:00
Steelpoint
d45890b4df
Merge branch 'master' of https://github.com/tgstation/-tg-station into GunsEdition
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-09 11:47:44 +08:00
Steelpoint
0e9a6106a3
Crates
2015-09-08 23:53:47 +08:00
AnturK
c2a26c81e7
Adds Create Custom Outfit admin verb
...
Sechud fix
2015-09-08 14:41:15 +02:00
AnturK
b3b18d0080
Job Outfits
2015-09-07 18:13:08 +02:00
