TheDZD
4dd3cd76bf
Merge pull request #3085 from Fox-McCloud/sec-rifle
...
Sec Rifle Port
2016-01-05 19:34:33 -05:00
Fox McCloud
67f704d235
Merge pull request #3119 from Crazylemon64/simple_animals_sleeping
...
Simple animals will now tick down sleeping
2016-01-05 02:37:37 -05:00
Crazylemon64
3a3f0f56c4
Simple_animals now tick down sleeping, so relogging doesn't cause deaf
2016-01-04 21:48:03 -08:00
Fox McCloud
d9520c4327
Merge pull request #3105 from Crazylemon64/guess-we-didn't-need-it
...
Removes that conversion proc we didn't actually use
2016-01-05 00:46:12 -05:00
Crazylemon64
2f642e6d75
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping
2016-01-04 21:44:27 -08:00
TheDZD
068a42b8f1
Merge pull request #3108 from Fox-McCloud/shock-fix
...
Fixes Shock Explosion Oversight
2016-01-04 22:03:14 -05:00
Crazylemon
df224e81d6
Simple animals will now tick down sleeping
2016-01-04 13:47:36 -08:00
Crazylemon
855b2f7f61
Summoned guardians will vanish without a master
2016-01-04 07:01:36 -08:00
Fox-McCloud
1f16068970
Fixes Shock Explosion Oversight
2016-01-04 07:46:45 -05:00
Crazylemon
01fd2e0f7b
Removes that conversion proc we didn't actually use
2016-01-03 21:43:59 -08:00
FalseIncarnate
a358291d83
EMERGENCY PASTE REMOVAL
...
Copy-paste struck again!
2016-01-04 00:00:50 -05:00
Fox-McCloud
44d46bc456
map fix
2016-01-03 22:42:59 -05:00
Fox-McCloud
38149bfc7d
Merge remote-tracking branch 'upstream/master' into sec-rifle
2016-01-03 22:35:28 -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
97527dddc6
tweak
2016-01-03 20:34:40 -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
7830cd215b
shotgun
2016-01-03 04:03:48 -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
Fox-McCloud
eade350dc8
Sec Rifle Port
2016-01-02 01:06:37 -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
