4dd3cd76bf
Merge pull request #3085 from Fox-McCloud/sec-rifle
...
Sec Rifle Port
2016-01-05 19:34:33 -05:00
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
3a3f0f56c4
Simple_animals now tick down sleeping, so relogging doesn't cause deaf
2016-01-04 21:48:03 -08:00
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
2f642e6d75
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping
2016-01-04 21:44:27 -08:00
1842b708cb
Merge pull request #3118 from Aurorablade/ValidCloning
...
Fixes antag huds showing after cloneing for solo antags
2016-01-05 00:28:42 -05:00
3bfb86a2f1
Boop
2016-01-05 00:23:08 -05:00
b2d2de16f4
antaf huds should no long be shown after clowning
...
i made typos in that commit message..it amuses me too much to fix.
2016-01-05 00:14:11 -05:00
068a42b8f1
Merge pull request #3108 from Fox-McCloud/shock-fix
...
Fixes Shock Explosion Oversight
2016-01-04 22:03:14 -05:00
bd606ede4f
Merge pull request #3111 from Crazylemon64/welding_tool_fuel_check
...
Fixes a flipped conditional that made welders unreadable
2016-01-04 18:11:01 -05:00
df224e81d6
Simple animals will now tick down sleeping
2016-01-04 13:47:36 -08:00
b06d542d50
Fixes a flipped conditional that made welders unreadable
2016-01-04 10:10:50 -08:00
855b2f7f61
Summoned guardians will vanish without a master
2016-01-04 07:01:36 -08:00
1f16068970
Fixes Shock Explosion Oversight
2016-01-04 07:46:45 -05:00
01fd2e0f7b
Removes that conversion proc we didn't actually use
2016-01-03 21:43:59 -08:00
a358291d83
EMERGENCY PASTE REMOVAL
...
Copy-paste struck again!
2016-01-04 00:00:50 -05:00
44d46bc456
map fix
2016-01-03 22:42:59 -05:00
38149bfc7d
Merge remote-tracking branch 'upstream/master' into sec-rifle
2016-01-03 22:35:28 -05:00
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
6b9fd8485c
Merge pull request #3103 from Fox-McCloud/fixes-shield-generator-boards
...
Fixes Shield Generator Circuits
2016-01-03 22:31:04 -05:00
9c863e5259
Merge pull request #3092 from tigercat2000/tgsmooth
...
-tg- Smoothing/Floor refactor
2016-01-03 22:28:50 -05:00
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
955eae12ff
Merge pull request #3100 from RudiPardieck/AtmosMonitorBugfix
...
Bugfix for atmos monitor
2016-01-03 21:47:01 -05:00
a3a03a67f9
derp
2016-01-03 21:38:43 -05:00
6ec065b319
Merge pull request #3102 from Fox-McCloud/ert-fix
...
ERT Medical Belt Fix
2016-01-03 21:38:15 -05:00
880efed300
Fixes Shield Generator Circuits
2016-01-03 21:36:27 -05:00
dfa55f1f35
ERT Medical Belt Fix
2016-01-03 21:23:49 -05:00
e9d5c67371
securer crates
2016-01-03 21:02:48 -05:00
97527dddc6
tweak
2016-01-03 20:34:40 -05:00
a1a0daaf2e
Merge pull request #3096 from Fox-McCloud/fast-transfer
...
Fixes Fast Crew Transfers
2016-01-03 20:03:37 -05:00
5555b00ff5
Merge pull request #3093 from Fox-McCloud/table-pushing-refactor
...
Table Pushing Refactor+Fix
2016-01-03 19:59:16 -05:00
5f43d9e93f
Merge pull request #3088 from tigercat2000/code_styling_nazi
...
January Cleaning
2016-01-03 19:42:09 -05:00
161ccaccc2
Merge pull request #3097 from TheDZD/thanksbyond
...
Makes IsBanned use text2num for CIDs
2016-01-03 19:35:01 -05:00
9ebe5c2c5c
Fixed using :i to speak into intercoms
2016-01-03 18:29:19 -05:00
fcc2ce7032
This fixes errors with the air alarm monitoring
2016-01-03 23:54:47 +01:00
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
cf77645cc7
Merge pull request #2853 from Regen1/Iamsodone
...
Nerfs the bag of holding + bag of holding effect
2016-01-03 11:34:08 -05:00
b161d32687
Merge pull request #3081 from Fox-McCloud/on-fire
...
Updates On Fire Sprite
2016-01-03 11:23:44 -05:00
34e047267d
Fast Crew Transfers
2016-01-03 09:11:06 -05:00
7830cd215b
shotgun
2016-01-03 04:03:48 -05:00
0bb97a1636
Table Pushing Refactor+Fix
2016-01-03 02:12:31 -05:00
797d5fa838
Merge pull request #3080 from FalseIncarnate/botany
...
Lastproduce Fix and Aging Consistency
2016-01-02 23:13:48 -05:00
a8e4d63925
Merge pull request #3079 from tigercat2000/styling
...
NanoUI Improvements Part 2: ELL EEE ESS ESS
2016-01-02 23:13:35 -05:00
290931300b
this has annoyed me for fucking ever
2016-01-02 11:11:15 -08:00
b606a6d1fd
Clean incorrect styling for the ++ operator
2016-01-02 10:46:01 -08:00
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
eade350dc8
Sec Rifle Port
2016-01-02 01:06:37 -05:00
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
e10610469d
Fixes Lack of Revenant Preferences
2016-01-01 21:25:42 -05:00
78abd5b12e
Updates On Fire Sprite
2016-01-01 21:06:07 -05:00
TheDZD