ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
3b89c07cd3
Merge pull request #8259 from phil235/BibleBookBagBug
...
Fixes book bags not being able to hold bibles and looking like backpacks
2015-03-13 12:51:10 -05:00
28f6aae00c
Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
...
Conflicts:
icons/mob/back.dmi
remie is a nerd btw
2015-03-12 20:47:11 -05:00
5d5c21266c
Merge pull request #8262 from MMMiracles/usaneverdie
...
Liberation Station 3: Patriotic Tears
2015-03-11 00:26:33 +01:00
1eba7b694b
Merge pull request #8134 from Miauw62/ghostradios
...
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
72f465c864
Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
...
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
1b1ee50b00
ASS BLAST USA USA USA USA
2015-03-09 17:50:37 -04:00
751fb4aaa9
Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.
2015-03-09 21:48:45 +00:00
4f6c96235b
Fixes book bags not being able to hold bibles.
...
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
2015-03-09 21:13:01 +01:00
82b1b1adcd
Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
...
Conflicts:
icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
79a20bd57b
slight fix
2015-03-09 19:19:17 +01:00
71d560bd3a
Fixes a runtime with buckling screen alert
...
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
fbab136950
Merge pull request #8016 from RemieRichards/EmbeddingBalance
...
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
f4734de342
Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
...
Fixes #8148 , Improves drill's handling of power
2015-03-08 23:41:50 -05:00
662caa554f
Merge pull request #8205 from phil235/AlienDisposalFix
...
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00
1a092e0ede
Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).
...
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
2015-03-08 22:15:55 +01:00
7488c47e7a
Merge pull request #8102 from Mandurrrh/tableclimbnerf
...
Balancing out tableclimbing.
2015-03-07 21:39:37 +00:00
77d553e619
Fixes disposal climbing.
...
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
95e269e211
Merge pull request #8122 from Xhuis/miners_messiah
...
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
377dd9f876
Merge pull request #8142 from phil235/girderfixes
...
Fixes many checks in construction from stacks,
2015-03-06 13:54:09 -06:00
68c791ee7c
Merge pull request #7751 from RemieRichards/ProceduralGeneration
...
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
0496dcd446
Merge pull request #8169 from dannno/morebarsigns
...
adds more barsigns
2015-03-06 13:35:13 -06:00
d56cb89407
Merge pull request #8076 from xxalpha/lighters
...
Grayscale Lighters
2015-03-06 00:00:51 -06:00
9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
07676b352d
Merge pull request #8128 from Ikarrus/gangfixup
...
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
354f59f10c
adds more barsigns
2015-03-05 14:06:44 -05:00
daa6fa89d0
Merge pull request #8014 from paprka/altclick2
...
Alt click for PDAs
2015-03-05 19:13:07 +01:00
1c55a568f2
Merge pull request #8075 from Xhuis/the_coderbus
...
Adds the Coderbus and Adminbus bar signs: No merge conflicts edition
2015-03-05 13:08:33 -05:00
652bac070b
Merge pull request #8156 from Mandurrrh/trailsbugfix
...
Fixes #8116 trails bug
2015-03-05 19:00:39 +01:00
82bc75c263
Moves chat toggles into their own variable.
2015-03-05 18:38:07 +01:00
a7e23d672a
Improves drill's handling of power
2015-03-05 17:12:12 +11:00
f68fd02d26
Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget
...
On screen alert system
2015-03-04 19:39:04 -06:00
48daa155d7
Fixes #8116 trails bug
2015-03-04 19:53:11 -05:00
39cccb82e4
Merge pull request #8123 from Ikarrus/randomspawns
...
Randomizes Order of Job Spawn Points
2015-03-03 22:57:16 -06:00
f5279273f1
Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example.
2015-03-03 23:43:17 +01:00
2d70141cd8
Allows admins (or coders if worn icons go the way of inhands) to specify an alternate file to load worn states from.
2015-03-03 20:23:26 +00:00
2499ed82f4
Adds the ore satchel of holding
2015-03-03 07:26:58 -05:00
5fcf0570b7
Merge pull request #8118 from Mandurrrh/pdabugfix
...
Fixes GhostPDA bug making it show in lobby. Please merge quick.
2015-03-03 11:26:48 +01:00
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
9b28452bfe
Makes Gang mode functional again
...
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.
A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.
It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
c62d387a1d
Randomizes Order of Job Spawn Points
...
The ticker's setup() will shuffle the list of spawn points, so jobs won't always predictably spawn bottom-up and left-to-right
2015-03-02 20:01:36 -07:00
c52a630a17
Fixes GhostPDA bug making it show in lobby.
2015-03-02 20:52:46 -05:00
467e102b49
Fixes trash disappearing when washed in a sink.
...
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00
2ec53ea6c7
Adds the second block for table climbing before the first return.
2015-03-02 16:53:15 -05:00
24dcf08b2e
Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/monkey/life.dm
icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
4272ada464
Merge pull request #8042 from Mandurrrh/ghostpda
...
Adds the ability to see pda messages in Deadchat
2015-03-02 19:56:28 +01:00
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
cde9de9e85
merge commits
2015-03-02 12:40:16 -05:00
da6d3fc2cd
Creates a separate toggle for ghosts to see pda messages!
2015-03-02 10:57:25 -05:00
Cheridan
phil235
MMMiracles
Remie Richards
phil235
hornygranny
dannno
Swag McYolosteinen
WJohn
Jordie0608
Mandurrrh
Xhuis
Ikarrus
MrPerson