Commit Graph

11784 Commits

Author SHA1 Message Date
Crazylemon
df224e81d6 Simple animals will now tick down sleeping 2016-01-04 13:47:36 -08:00
FalseIncarnate
a358291d83 EMERGENCY PASTE REMOVAL
Copy-paste struck again!
2016-01-04 00:00:50 -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
TheDZD
6b9fd8485c Merge pull request #3103 from Fox-McCloud/fixes-shield-generator-boards
Fixes Shield Generator Circuits
2016-01-03 22:31:04 -05:00
Fox McCloud
9c863e5259 Merge pull request #3092 from tigercat2000/tgsmooth
-tg- Smoothing/Floor refactor
2016-01-03 22:28:50 -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
Fox-McCloud
a3a03a67f9 derp 2016-01-03 21:38:43 -05:00
Fox-McCloud
880efed300 Fixes Shield Generator Circuits 2016-01-03 21:36:27 -05:00
Fox McCloud
5f43d9e93f Merge pull request #3088 from tigercat2000/code_styling_nazi
January Cleaning
2016-01-03 19:42:09 -05:00
Fox McCloud
161ccaccc2 Merge pull request #3097 from TheDZD/thanksbyond
Makes IsBanned use text2num for CIDs
2016-01-03 19:35:01 -05:00
Tastyfish
9ebe5c2c5c Fixed using :i to speak into intercoms 2016-01-03 18:29:19 -05:00
TheDZD
15170405d4 Makes IsBanned use text2num for CIDs
CIDs are text, not numbers, so this is necessary. Port of tgstation/-tg-station#13577, might finally sticky bans going haywire.
2016-01-03 11:56:39 -05:00
TheDZD
b161d32687 Merge pull request #3081 from Fox-McCloud/on-fire
Updates On Fire Sprite
2016-01-03 11:23:44 -05:00
Fox McCloud
797d5fa838 Merge pull request #3080 from FalseIncarnate/botany
Lastproduce Fix and Aging Consistency
2016-01-02 23:13:48 -05:00
Fox McCloud
a8e4d63925 Merge pull request #3079 from tigercat2000/styling
NanoUI Improvements Part 2: ELL EEE ESS ESS
2016-01-02 23:13:35 -05:00
Tigercat2000
b606a6d1fd Clean incorrect styling for the ++ operator 2016-01-02 10:46:01 -08:00
KasparoVy
f18c04ed0e Adds Vulpkanin head markings to Head Accessory
Tested and it turns out it looks pretty good. The purpose of this commit
is that most of the facial markings work quite well together in pairs
given proper colouring and can look pretty sweet, so why not
2016-01-02 01:13:14 -05:00
FalseIncarnate
4806834674 Lastproduce Fix and Aging Consistency
Fixes #3062

Also adjusts how plants age (mature)
- Previously was RNG based.
- 30% chance per cycle to age up
- Now more consistent and predictable
- Every 3 cycles for the tray, the plant will age up.
- Average maturation time should be comparable, but will no longer
occasionally result in hyper-growth or snail-speed growth when RNG is
feeling fickle.

Removes a space
2016-01-01 21:38:23 -05:00
Fox-McCloud
78abd5b12e Updates On Fire Sprite 2016-01-01 21:06:07 -05:00
TheDZD
ac8a3ba061 Merge pull request #3068 from Fox-McCloud/shocking
Electrocution Refactor+Electric Reagents
2016-01-01 18:55:36 -05:00
Fox McCloud
44a2560d88 Merge pull request #3070 from Crazylemon64/apc-area-removal
Removes the apc from the area's APC list when destroyed
2016-01-01 17:33:39 -05:00
Fox McCloud
e27d585889 Merge pull request #3072 from Aurorablade/Flyswatter
bug fixes
2016-01-01 17:33:19 -05:00
Fox McCloud
0e0eae8087 Merge pull request #3073 from Tastyfish/running-into-walls
Makes footstep sounds check if we actually moved
2016-01-01 17:32:06 -05:00
Fox McCloud
949c2f221f Merge pull request #3075 from Tastyfish/apc-areas
Removed redundant APC's, fixed a couple of ill-defined areas
2016-01-01 17:31:53 -05:00
Tigercat2000
0971ef903b NanoUI Improvements Part 2: SEE ESS ESS 2016-01-01 12:51:08 -08:00
Tastyfish
72d2db27c4 Fixed Test Areas and added checking for too many apc's 2016-01-01 01:57:48 -05:00
Tastyfish
421faee4f8 Makes footstep sounds check if we actually moved 2016-01-01 01:45:47 -05:00
Crazylemon
6a931ef868 Removes the apc from the area's APC list when destroyed 2015-12-31 22:34:03 -08:00
Aurorablade
ce7f05334d Bug fixes 2016-01-01 01:26:44 -05:00
TheDZD
7fb32aca37 Merge pull request #3056 from Fox-McCloud/nuke-challenge
Nuclear Challenge Mode
2015-12-31 22:40:19 -05:00
Fox-McCloud
29ed8f2399 tweak 2015-12-31 18:17:12 -05:00
Fox-McCloud
e38417cebe Electrocution Refactor+Electric Reagents 2015-12-31 17:28:27 -05:00
Fox McCloud
bc4b449c22 Merge pull request #3066 from Crazylemon64/now-you-can-actually-facefix-robos
Can actually do robot face surgery now
2015-12-31 14:13:48 -05:00
Fox McCloud
8d5e4b374d Merge pull request #3061 from RudiPardieck/floral
required reagants now show when searching on protolathe
2015-12-31 14:13:29 -05:00
Crazylemon
64fdb07847 Can actually do robot face surgery now 2015-12-31 10:47:37 -08:00
Certh
d3f6329aee required reagants now show when searching on protolathe 2015-12-31 14:52:44 +01: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
Fox McCloud
e67450d56d Merge pull request #3025 from Crazylemon64/infinite_antags
Infinite antag tags
2015-12-30 13:52:41 -05:00
TheDZD
6433e3fc41 Merge pull request #3043 from Fox-McCloud/elite-syndi-hardsuit
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-30 13:49:39 -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
ce2eb1c0ad Nuclear Challenge Mode 2015-12-30 03:03:06 -05:00
Fox-McCloud
d14aac6f7b nicotine patches 2015-12-30 00:07:37 -05:00
Fox McCloud
9b2db8dd24 Merge pull request #3044 from DaveTheHeadcrab/ninja
Add darkness_view to Helmets
2015-12-29 23:42:09 -05:00
Fox-McCloud
9045a4f011 flavortext tweaks 2015-12-29 22:43:18 -05:00
KasparoVy
a1d0e5a0df Keeping Up-to-date with 3025 2015-12-29 19:36:14 -05:00
Crazylemon
e576b3a777 Fixes Fox's points 2015-12-29 10:18:56 -08:00
Fox-McCloud
4908b32727 A few Overdose Reagent Tweaks 2015-12-29 00:56:08 -05:00
Fox McCloud
1343ad658f Merge pull request #3041 from tigercat2000/cleaningrr
Cleaning time~
2015-12-28 23:28:14 -05:00
KasparoVy
5d816d943d Cleans up the tiniest bit. 2015-12-28 20:57:07 -05:00