793243763d
Merge pull request #7185 from paprka/inhandrefactor
...
Inhand refactor
2015-01-20 22:16:06 -06:00
8f98597490
Merge pull request #7049 from RemieRichards/PipesAndBuckles
...
Buckling Refactor + HE Pipe heat based colour
2015-01-20 20:07:18 -06:00
e4891e37d5
Merge pull request #7227 from Alek2ander/howdidyouexpectthistowork
...
Fixes genetics
2015-01-20 21:05:44 -03:00
d97e01e0db
Merge pull request #7120 from Menshin/clusterbangs_fix
...
Made clusterbangs functionals
2015-01-20 21:00:52 -03:00
f4ed29551b
Merge pull request #7204 from Deantwo/NoCommentPDA
...
Blank PDA Messages Fix
2015-01-20 21:21:18 +01:00
6eee450855
Fixes genetics
2015-01-20 23:01:35 +03:00
e979bc95b1
Merge pull request #7150 from paprka/shoulderholster
...
Adds shoulder holster for the detective
2015-01-20 17:59:25 +01:00
48d032bd88
Merge pull request #7146 from paprka/wcoatr
...
Tones down winter coat spawning, removes santa hat spawns
2015-01-20 17:57:24 +01:00
63cb7dad4a
Merge pull request #7145 from paprka/gunsicons
...
splits gun.dmi up into multiple files
2015-01-20 17:56:41 +01:00
f7216ed535
Merge pull request #7161 from Firecage/Simple_animal_suiciding
...
This adds the ability for simple animals to commit suicide.
2015-01-19 18:50:37 -08:00
a9160e52dc
Merge pull request #7105 from Carn/#6993
...
Resolves #6993 - Moved pai controller into a subsystem.
2015-01-19 20:17:14 -03:00
2a78daa8b5
Blank PDA Messages Fix
...
- Added "if (!t) return" after msg_input is called. So no blank
messages.
2015-01-19 20:10:21 +01:00
96ac837b65
Merge pull request #6960 from Iamgoofball/goonetics
...
Added 2 new powers and 9 new disabilities from goon and /vg/!
2015-01-19 17:47:33 +00:00
f58096575c
refactors guns
2015-01-18 23:28:24 -08:00
98ecd7ffdc
Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup
...
Goon Chemistry: Addiction and Overdosing
2015-01-19 03:32:57 -03:00
b83ca5f8d1
Goon Chemistry: Addiction and Overdosing
2015-01-18 21:50:54 -08:00
2706be1190
optimizations to the way inhand files are found
2015-01-18 21:14:47 -08:00
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
c226a7aa2e
Merge pull request #7053 from Chocobro/interceptreportimprovement
...
updates intercept report w/ formatting, spellcheck
2015-01-18 22:14:26 -06:00
cc0a9a674e
Merge pull request #7147 from paprka/clothescleanup
...
Removes a ton of bloat from several clothing files and inhands
2015-01-18 20:26:36 -06:00
893c876261
Add the message argument to can_speak
...
It is needed for *raisans*
2015-01-19 10:25:51 +13:00
c866cd5189
This adds the ability for simple animals to commit suicide. ;)
2015-01-18 10:52:27 +02:00
b64efc6b54
Adds 3 new disabilities
2015-01-17 18:55:41 -08:00
f797b04e15
adds shoulder holster for the detective
2015-01-17 17:11:38 -08:00
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
ae21c54774
rip reindeer horns
2015-01-17 15:43:39 -08:00
b83e6d9da4
winter coat removals
2015-01-17 15:39:50 -08:00
1b6831dab1
splits gun.dmi up into multiple files
2015-01-17 15:34:30 -08:00
059d8cf650
Merge pull request #7098 from Menshin/disposal_constructs_stacking_prevention
...
Some disposals cleaning/stacking fix
2015-01-17 17:16:52 -03:00
8a61d11e2e
Merge pull request #7069 from Firecage/table_deconstruction_fix
...
Fixes amount of materials gotten from deconstructing tables
2015-01-17 19:57:49 +01:00
3a397a9472
Merge pull request #7124 from Iamgoofball/goonchem_shoehorn_backup
...
Removes Star Trek chemicals, replaces them with Goon Chemistry
2015-01-17 01:32:38 -03:00
8b3cff9281
Forgot a ephedrine -> epinephrine
2015-01-16 19:29:25 -08:00
bc9d48fa42
Mutadone and Mannitol, tweaks and changes.
2015-01-16 19:28:13 -08:00
35cc6e3c54
Replaces pathing.
2015-01-16 18:21:01 -08:00
3867079e51
Merge pull request #7068 from tkdrg/toast
...
Adds chemical heater nanoUI & construction/upgrade
2015-01-17 01:29:13 +00:00
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
c08e4e4332
Merge pull request #7084 from JJRcop/ChronOPS
...
Adds Chronosuit and T.E.D
2015-01-17 01:02:52 +00:00
87881ffb94
Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-17 09:55:12 +11:00
309f8ca1b0
Made clusterbangs functionals again.
...
General code cleanup.
2015-01-16 22:29:17 +01:00
ac3c413f24
Merge pull request #6969 from Firecage/Biogenerator_stuff
...
Adds stuff to Biogenerator. STUFF!.
2015-01-16 17:31:25 -03:00
8fecbe2318
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
...
Conflicts:
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/projectiles.dmi
2015-01-16 14:09:07 -05:00
2ed26720d4
Merge pull request #7082 from paprka/varincrease
...
Further adjusts dirt on tiles
2015-01-16 17:00:55 +01:00
0ebd227f71
Merge pull request #7034 from paprka/nosenseofrightandwrongiguess
...
Crossbow, speargun, and grenade updates
2015-01-16 16:43:50 +01:00
dc602f9d57
Indentation fix. How did that single space instead of the tab worl anyway...
2015-01-16 15:38:31 +02:00
3594c96aca
Merge pull request #7090 from Firecage/HONKER_mousetrap_mortor
...
Fixes the issue of mousetrap mortars firing unarmed mousetraps.
2015-01-16 14:22:30 +01:00
018b7379b4
Merge pull request #7088 from Firecage/tele_window_knocking_delay
...
Simply adds a delay to knocking in windows with TK.
2015-01-16 13:59:39 +01:00
4a0aa0c0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/ammunition/ammo_casings.dm
code/modules/projectiles/ammunition/boxes.dm
icons/obj/ammo.dmi
icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
6bfebf2e48
Adds bolt-action rifle
...
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151
These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.
The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03:00
eae84c1c39
further conflicts and bugfixes
2015-01-15 21:59:36 -08:00
Cheridan
tkdrg
phil235
Alek2ander
Swag McYolosteinen
Ergovisavi
Deantwo
Remie Richards
paprka
Iamgoofball
Orange Borg
Firecage
Sawu
Menshin
JJRcop