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
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
bd19dc6942
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-01 22:38:23 -05:00
a4c420ccde
Conflict fixing time
2016-01-01 22:32:13 -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
78abd5b12e
Updates On Fire Sprite
2016-01-01 21:06:07 -05:00
ac8a3ba061
Merge pull request #3068 from Fox-McCloud/shocking
...
Electrocution Refactor+Electric Reagents
2016-01-01 18:55:36 -05:00
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
e27d585889
Merge pull request #3072 from Aurorablade/Flyswatter
...
bug fixes
2016-01-01 17:33:19 -05:00
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
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
0971ef903b
NanoUI Improvements Part 2: SEE ESS ESS
2016-01-01 12:51:08 -08:00
72d2db27c4
Fixed Test Areas and added checking for too many apc's
2016-01-01 01:57:48 -05:00
421faee4f8
Makes footstep sounds check if we actually moved
2016-01-01 01:45:47 -05:00
6a931ef868
Removes the apc from the area's APC list when destroyed
2015-12-31 22:34:03 -08:00
ce7f05334d
Bug fixes
2016-01-01 01:26:44 -05:00
7fb32aca37
Merge pull request #3056 from Fox-McCloud/nuke-challenge
...
Nuclear Challenge Mode
2015-12-31 22:40:19 -05:00
29ed8f2399
tweak
2015-12-31 18:17:12 -05:00
e38417cebe
Electrocution Refactor+Electric Reagents
2015-12-31 17:28:27 -05:00
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
8d5e4b374d
Merge pull request #3061 from RudiPardieck/floral
...
required reagants now show when searching on protolathe
2015-12-31 14:13:29 -05:00
64fdb07847
Can actually do robot face surgery now
2015-12-31 10:47:37 -08:00
d3f6329aee
required reagants now show when searching on protolathe
2015-12-31 14:52:44 +01:00
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -05:00
eb47c80d75
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 18:16:17 -05:00
135475332b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 17:41:26 -05:00
e67450d56d
Merge pull request #3025 from Crazylemon64/infinite_antags
...
Infinite antag tags
2015-12-30 13:52:41 -05:00
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
032a5dfe9e
Merge pull request #3047 from Fox-McCloud/reagent-tweaks
...
A few Overdose Reagent Tweaks
2015-12-30 13:49:30 -05:00
ce2eb1c0ad
Nuclear Challenge Mode
2015-12-30 03:03:06 -05:00
d14aac6f7b
nicotine patches
2015-12-30 00:07:37 -05:00
9b2db8dd24
Merge pull request #3044 from DaveTheHeadcrab/ninja
...
Add darkness_view to Helmets
2015-12-29 23:42:09 -05:00
9045a4f011
flavortext tweaks
2015-12-29 22:43:18 -05:00
a1d0e5a0df
Keeping Up-to-date with 3025
2015-12-29 19:36:14 -05:00
e576b3a777
Fixes Fox's points
2015-12-29 10:18:56 -08:00
4908b32727
A few Overdose Reagent Tweaks
2015-12-29 00:56:08 -05:00
1343ad658f
Merge pull request #3041 from tigercat2000/cleaningrr
...
Cleaning time~
2015-12-28 23:28:14 -05:00
5d816d943d
Cleans up the tiniest bit.
2015-12-28 20:57:07 -05:00
b5436ba669
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-28 20:44:12 -05:00
f0c4a0623c
Final Accommodation of #3025
...
Copypastas #3025 's version of code\modules\client\preferences.dm and
re-applies all the changes I made to the pre-#3025 version of that file
in order to accommodate the PR.
2015-12-28 20:43:58 -05:00
78d3045eca
Accommodates #3025
2015-12-28 19:55:49 -05:00
8641c065a3
Removes Old Earfluff Entries, Finishes SQL Support, Accommodates #3025
2015-12-28 19:17:56 -05:00
24aa63c812
Adds darkness_view to helmets
2015-12-28 09:55:13 -05:00
c6a0a2fe4e
Merge pull request #3036 from DaveTheHeadcrab/ninja
...
Add "Creeping Widow" Martial Art
2015-12-28 08:46:44 -05:00
0f03947d55
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-28 08:37:27 -05:00
e5bcd0d39f
Format update now also autosaves the new antag prefs
2015-12-28 01:15:22 -08:00
c4cb53bf0a
To heck with it here we go looks good enough
...
Also
- Increases the number of memes in the codebase
2015-12-28 01:12:13 -08:00
Fox McCloud