TheDZD
3d316d9c66
Merge pull request #3116 from Fox-McCloud/slipping-floors
...
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
Fox-McCloud
44fe321366
cleaner
2016-01-05 20:14:10 -05:00
TheDZD
ebdbe4627b
Merge pull request #3114 from Fox-McCloud/chem-master
...
Constructable Chem Master
2016-01-05 19:36:11 -05:00
Fox-McCloud
550aef34ba
less copy-paste
2016-01-04 21:54:47 -05:00
Fox-McCloud
4221d033ab
Slipping Refactor and Floors
2016-01-04 21:22:59 -05:00
Fox-McCloud
51851e9ec5
Constructible Chem Master
2016-01-04 18:23:41 -05:00
Aurorablade
948adea83b
Added Asses as an organ
...
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Fox-McCloud
1f16068970
Fixes Shock Explosion Oversight
2016-01-04 07:46:45 -05:00
Fox McCloud
103372e92b
Merge pull request #3037 from KasparoVy/master
...
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
2016-01-03 22:33:40 -05:00
Tigercat2000
31aab5452b
-tg- smoothing/floor refactor
...
Squashed:
Add plasteel goonplaque turf
Builtin_tile nulling
Levelupdate()
Fix falsewalls, update smoothing.dmm
fixes rwall decon
2016-01-03 19:24:13 -08:00
Aurorablade
bd19dc6942
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-01 22:38:23 -05:00
Fox-McCloud
e38417cebe
Electrocution Refactor+Electric Reagents
2015-12-31 17:28:27 -05:00
KasparoVy
eb47c80d75
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 18:16:17 -05:00
KasparoVy
135475332b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 17:41:26 -05:00
TheDZD
032a5dfe9e
Merge pull request #3047 from Fox-McCloud/reagent-tweaks
...
A few Overdose Reagent Tweaks
2015-12-30 13:49:30 -05:00
Fox-McCloud
d14aac6f7b
nicotine patches
2015-12-30 00:07:37 -05:00
Fox-McCloud
9045a4f011
flavortext tweaks
2015-12-29 22:43:18 -05:00
Fox-McCloud
4908b32727
A few Overdose Reagent Tweaks
2015-12-29 00:56:08 -05:00
Tigercat2000
9cb84e83ca
Clean old shit, delete old files, move files, mrowl
2015-12-27 15:58:41 -08:00
KasparoVy
6ba20458e5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
...
# Conflicts:
# icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
KasparoVy
5f72fff880
Final Pass
...
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.
Fixes/implements proper ID photo/preferences preview picture generation.
To do: Tail marking customization possible rework, gutting in the
meantime
2015-12-27 05:45:25 -05:00
Aurorablade
2146cc0d3d
things
...
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -05:00
Aurorablade
1a70e9caf5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2015-12-24 00:17:26 -05:00
FalseIncarnate
1d281e8a6f
Cocoa spawning revert
2015-12-21 00:42:27 -05:00
Aurorablade
80eb828563
this shit dosen't even compile yet...
2015-12-19 22:39:47 -05:00
FalseIncarnate
a744ffdc3c
Assorted Sprite-Related Fixes
...
Candy canes no longer have transparent stripes
- Fixes #2876
- Moved candy.dmi into the icons/obj/food/ folder
- Removed the candy sprites from the food.dmi file
Replaced reagentchocolatebar with cocoa_pile
- This is what is made when you spill chocolate reagent on the floor,
and is not the same as the chocolate bars you use for making stuff
- Should avoid confusion and also fixes a potential infinite-generation
exploit of chocolate and sugar
- Fixes #2614
Flamethrower in-hand icons now display properly
- Fixes #2856
- Will always show a tank in the in-hand, regardless of if a tank is
attached
Smartfridges will now remain visible when you open their panels with a
screwdriver
- Fixes #2847
Hand-rolled cigarettes now show on sprite when equipped as a mask
- Fixes #2427
Apple seeds now have a proper seed packet
- Fixes #1409
- Will make the xenobotany machines mentioned in the issue buildable in
a separate PR, as that is beyond scope / feature-request
2015-12-18 08:45:30 -05:00
Fox McCloud
3d04e396ed
Merge pull request #2825 from Tastyfish/coughsplosion
...
Added voice analyzer & Entertainment monitor supporting audible emotes
2015-12-14 20:47:33 -05:00
Fox-McCloud
e15f65ce1f
CRY SUM MOAR
2015-12-13 18:10:32 -05:00
Tastyfish
f39649be57
added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support
2015-12-13 04:36:41 -05:00
Fox-McCloud
309e325d3d
Aranesp Tweak
2015-12-12 23:39:42 -05:00
TheDZD
3986cbe698
Merge pull request #2813 from Fox-McCloud/antihol-fix
...
Reagent Fixes and Tweaks
2015-12-12 23:28:47 -05:00
Fox-McCloud
5d1e24bc53
tweaks
2015-12-12 18:03:37 -05:00
Fox-McCloud
b84f31ac5c
painkiller tweak
2015-12-12 16:51:37 -05:00
Fox-McCloud
1d6f5e07ad
rezadone tweak
2015-12-12 02:27:22 -05:00
Fox-McCloud
dbeb31cd88
Fixes Antihol
2015-12-11 23:07:00 -05:00
Fox-McCloud
068bfd10ba
TG Mining Update
2015-12-10 21:35:02 -05:00
TheDZD
23b405a905
Merge pull request #2777 from RudiPardieck/grammar-fix
...
Fixes mistakes with using /improper instead of \improper
2015-12-08 22:01:25 -05:00
Fox McCloud
f71c68739a
Merge pull request #2764 from Crazylemon64/corgi_munch_fix
...
Corgis and mice will now heal when eating
2015-12-08 13:50:20 -05:00
Certh
d665bb0729
Fixes mistakes with using /improper instead of \improper
2015-12-08 10:37:42 +01:00
Crazylemon
438f6d9a8c
Corgis and mice will now heal when eating
...
As things stood, they just modified the current registered value of
health, which would immediately be recalculate. This makes this less
stupid.
2015-12-07 09:42:12 -08:00
Certh
591daf04d2
Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
...
Also corrected some periods, spelling errors etc. along the way.
If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
ZomgPonies
fab7f1f6b0
exotic blood changes
2015-12-05 16:46:07 -05:00
TheDZD
cd3ce35f07
Merge pull request #2701 from Fox-McCloud/phlog-tweak
...
Phlog Nerf/Balance
2015-12-02 19:15:12 -05:00
Fox-McCloud
afeb0f30ce
Phlog Nerf/Balance
2015-12-01 00:32:42 -05:00
Tastyfish
b2abdd34c1
added input cancelling to pda msg, chemmaster ops, borg mod selection
2015-11-30 01:06:21 -05:00
Fox-McCloud
59a929cd34
Ports over TG Sentience Potion
2015-11-26 12:08:16 -05:00
TheDZD
3211ba3a28
Merge pull request #2646 from Fox-McCloud/soy-sauce
...
Soy Sauce Recipe Change
2015-11-24 21:39:33 -05:00
Fox McCloud
c7ae3c0233
Merge pull request #2640 from FalseIncarnate/master
...
Random Chem Blacklists, Strange Plant Fixes
2015-11-24 21:38:22 -05:00
Tastyfish
317760a7de
Merge remote-tracking branch 'upstream/master' into path_cleanups
...
Conflicts:
code/modules/examine/descriptions/atmospherics.dm
2015-11-24 18:05:01 -05:00
Fox-McCloud
2ba8854329
Soy Sauce Recipe Change
2015-11-23 21:13:10 -05:00
