Aurorablade
b691b71fef
Revert "urgh i update the wrong file...hush"
...
This reverts commit 124fc7c329
2016-01-15 07:58:45 -05:00
Aurorablade
5f7c634bc7
Revert "too early for this shit"
...
This reverts commit 56d9a12dba
2016-01-15 07:58:27 -05:00
Aurorablade
56d9a12dba
too early for this shit
2016-01-15 07:49:16 -05:00
Aurorablade
124fc7c329
urgh i update the wrong file...hush
2016-01-15 07:28:15 -05:00
Aurorablade
ba87398eea
conflict fixes
2016-01-15 07:11:28 -05:00
Aurorablade
678a2e9f4e
commit so i can go bugfix and do other things
...
besides code in organs...tell me what i did wrong!
2016-01-09 00:05:25 -05:00
Aurorablade
87d2023af3
so you can almost perform surgery with a claymore
...
things needed: Addeing the sharp object used as a low success allowed
tool on the fly. Handleing advanced scalpals.
2016-01-07 23:25:06 -05:00
Aurorablade
2623f75e0d
progress
2016-01-06 23:43:12 -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
Aurorablade
bd19dc6942
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-01 22:38:23 -05:00
Aurorablade
a4c420ccde
Conflict fixing time
2016-01-01 22:32:13 -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
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
Aurorablade
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -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
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
SamCroswell
24aa63c812
Adds darkness_view to helmets
2015-12-28 09:55:13 -05:00
Fox McCloud
c6a0a2fe4e
Merge pull request #3036 from DaveTheHeadcrab/ninja
...
Add "Creeping Widow" Martial Art
2015-12-28 08:46:44 -05:00
Fox-McCloud
0f03947d55
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-28 08:37:27 -05:00
Crazylemon64
e5bcd0d39f
Format update now also autosaves the new antag prefs
2015-12-28 01:15:22 -08:00
Crazylemon64
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
SamCroswell
b690dd8a9d
Replaces Sleep with Paralysis
2015-12-28 00:21:38 -05:00
Tigercat2000
9cb84e83ca
Clean old shit, delete old files, move files, mrowl
2015-12-27 15:58:41 -08:00
Crazylemon64
6f631b94c3
Reduces the amount of memes in the codebase
2015-12-27 14:46:11 -08:00
Crazylemon64
45e49de3f8
Adds an update proc for the sql DB, run as the DB is loaded
...
There's probably a cooler and more automated, at-once solution to this
though
2015-12-27 14:33:14 -08:00
Crazylemon64
dc29161339
Adds an SQL list sanitization proc, and stores our tags in the DB
2015-12-27 13:43:50 -08:00
SamCroswell
2a62ed1dce
Tigercat's Optimizations
2015-12-27 15:59:42 -05:00
Crazylemon
c227ae536c
Added a bunch of new antag tags because whee these are cheap
...
Also it compiles now
as for not turning the DB into mush... wait on that "feature"
2015-12-27 07:58:21 -08:00
