263e2abec6
Merge pull request #2885 from AlexanderUlanH/idedplsnerf
...
Rebalanced EMP's against mobs
2014-03-02 13:26:38 -08:00
467e65279b
Merge pull request #2904 from Rumia29/22/02/2014_sombrero
...
Sombrero(s) + Ponchos
2014-03-02 19:41:37 +00:00
e6d654853b
Merge pull request #2945 from YotaXP/kill-group_multiplier
...
Removed old FEA files, and a more-than-useless variable.
2014-03-02 14:59:56 -02:00
bb6009c9b7
Merge conflicts a bitch
2014-03-02 04:34:56 +04:00
08064142e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into LingSting
2014-03-02 04:29:26 +04:00
a671ea8c8b
removes my fucks ups, Chemistry-Recipes.dm is standardized now (again) and the weedkiller and pestkiller chemical reactions are added back.
2014-03-01 18:15:12 -03:00
5ef67438e6
grammarfix
2014-03-01 15:40:50 -05:00
600bf077f5
Updated file; fixed conflicts
2014-03-01 15:20:03 -05:00
cbffed689d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeReactions
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2014-03-01 16:22:01 -03:00
25baec633c
Poncho + Ian Sombrero update
2014-03-01 12:37:42 -05:00
cb7052f81c
Removed group_multiplier nonsense from gas_mixture.
...
Moved gas_mixture.dm to the datums directory.
Deleted FEA.
2014-02-28 18:12:33 -05:00
056932aa58
corrects unbuckle feedback message
2014-02-27 21:59:43 -08:00
e65dc20971
Electrodes, stun bullets, darts and bolts reduced from 10 to 5
2014-02-27 13:04:58 -08:00
c31647376e
This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.
...
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
2014-02-27 10:56:06 -08:00
39927c2cb3
New robotic limb emp message
...
Now with more immersion
2014-02-26 12:44:04 -05:00
5c55636bc0
Revert "Removes radio from pAI"
...
This reverts commit 0dc364a6b1
2014-02-26 14:50:18 +01:00
6695c0c13b
Merge pull request #2850 from MrPerson/revenge_of_kitty_ears
...
Return of kitty ears
2014-02-26 07:40:39 -02:00
98b39580cd
haha oops thanks travis
2014-02-25 23:25:30 -06:00
b84c7c3b1d
Merge branch 'master' of https://github.com/Kelenius/-tg-station into Kelenius-master
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
code/game/machinery/vending.dm
code/modules/hydroponics/hydroponics.dm
2014-02-25 23:11:56 -06:00
21013863b9
Fixes conflicts
2014-02-25 19:49:24 -06:00
5ec24c8613
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
code/modules/reagents/Chemistry-Reagents.dm
resolved with Theirs, must manually reapply fixes
2014-02-25 19:39:26 -06:00
1a832cfb55
Boop
2014-02-25 19:26:20 -05:00
9a2426a219
Merge pull request #2903 from hornygranny/harmyeller
...
Removes pAI radio
2014-02-25 17:19:11 -06:00
a3dd6c4dda
Consistentification
...
Sticking with the high-end of damage, for lack of strong opinions. Also
removed false claims of certain procs' being in human_defense.dm, and a
useless emp_act override in ion rifles. (All EMP's are 1 or 2 severity)
2014-02-25 10:04:49 -05:00
7de04b6c3c
Merge branch 'master' into spaceareas
2014-02-24 17:47:19 -05:00
38b438b261
Merge branch 'master' into idedplsnerf
2014-02-24 17:45:03 -05:00
5bea175ac8
Classic Sombrero update
2014-02-24 17:09:34 -05:00
6f7b75f38c
Merge pull request #2895 from Incoming5643/prettypatties
...
[map] Pretty Patties
2014-02-24 15:51:45 -06:00
af75d13216
Conflicts:
...
code/modules/hydroponics/hydroponics.dm
Fixed, hopefully
2014-02-25 01:26:05 +04:00
e0c7cbaab0
Adds two sombreros to the code, one is vend-able at the autodrobe, and the other is admin-spawnable, since, like golem clothing, you're unable to take it off yourself.
...
Thanks to MattyQ for the sprites
2014-02-24 15:27:58 -05:00
ff08e7c557
Merge pull request #2893 from Miauw62/gurehibjkogtirfhdgyf(ihgufhygdfrgjihkigfjuhygdfhijgufhygdhufrg
...
Fixed more NODROP runtimes
2014-02-24 13:43:33 -06:00
0dc364a6b1
Removes radio from pAI
2014-02-24 10:44:26 -08:00
217132efa6
Merge pull request #2877 from Incoming5643/boltbgone
...
Bolt of animation fix
2014-02-24 15:03:06 -02:00
b64ba5ba1e
Merge pull request #2887 from Giacom/statue_fixes
...
Silicons no longer stop statues from being able to move.
2014-02-24 14:59:00 -02:00
0a8e8a6b3e
Merge pull request #2843 from MrPerson/its_a_beeeeeeeeeeeeaaaaaaaarrrr!!!!!
...
Standardized space bears.
2014-02-24 08:07:48 -08:00
90fe98402c
Merge pull request #2890 from Razharas/TeleSci
...
Telescience fix
2014-02-24 14:04:59 -02:00
94907b1311
Merge pull request #2839 from Aranclanos/BloodReagent
...
Blood runtimes fix.
2014-02-24 07:56:39 -08:00
d8f12f0680
Merge pull request #2836 from Cheridan/hydro
...
Drying Rack as smartfridge
2014-02-24 07:56:17 -08:00
3d90e8815e
Merge pull request #2827 from Ergovisavi/muh_vision
...
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
2014-02-24 07:55:34 -08:00
00512ba146
Merge pull request #2805 from rymd/somatoray
...
Floral somatoray requires radium instead of uranium
2014-02-24 07:54:39 -08:00
58f871ca25
By sticking a crayon in the mix when making a burger you can now make a colored burger!
...
Standardizes burger code to end the madness of there being like 30 different burgers that have the same damn thing in them.
2014-02-23 18:34:32 -05:00
f75692ceed
Fixed more NODROP runtimes
2014-02-23 19:34:49 +01:00
2a7f688d90
Fixes a NODROP runtime.
2014-02-23 19:20:27 +01:00
e6c856e456
Merge pull request #2803 from Rockdtben/SyndCardDesc
...
Synd card desc
2014-02-23 13:46:10 -02:00
84e1d9872e
Telescience fix
...
Fixes infinite telecrystals from telescience
I tested most of the computers and they were good
No idea who put initialize into new and why
2014-02-23 16:54:52 +04:00
e306f40647
Merge pull request #2870 from Aranclanos/ReagentCodeSpawn
...
Removed some spawn(0) calls from the reagent code, fixes runtimes.
2014-02-22 23:39:35 -06:00
c91a3a1ed5
Merge pull request #2856 from Giacom/wiki_manuals
...
[MAP] Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
2014-02-22 23:28:04 -06:00
916e7c9ec3
Silicons no longer stop statues from being able to move.
...
Added a variable that will allow you to have the statues move while seen.
2014-02-22 22:22:02 +00:00
895d0a30ab
Nerfed EMP's against augmented limbs
...
Because there's not much benefit to only having a few limbs augmented,
and 120/60 damage just silly. For comparison, cyborgs take 20 damage
total from an EMP and 5-10 stun, and humans take 60 brute damage for
being just outside the gibbing range of a bomb.
This PR brings the average damage from a strong EMP to an aug down to
48, and from a weak EMP down to 30. The stun against a full aug is
still very likely to be around 10 or 5, respectively. This is on top of
having weapons drained, headsets disabled, etc.
2014-02-22 14:00:15 -05:00
b723f68979
Merge pull request #2868 from Aranclanos/StopThinkingBrain
...
Stops brains generating runtimes by toggling throw mode
2014-02-22 12:58:36 -06:00
Razharas
fleure
Aranclanos
Razharas
Rumia29
YotaXP
Hornygranny
AlexanderUlanH
Miauw
Cheridan
Jittai
Rockdtben
Kelenius
Incoming
Giacomand