Mark van Alphen
5f6d98a5e0
Merge pull request #372 from Artorp/AutolatheFix
...
Fixed autolathe
2015-02-21 02:12:44 +01:00
Artorp
c93bc2acf8
Fixed autolathe merge conflict
2015-02-21 01:36:14 +01:00
ZomgPonies
dd79cb9ef2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-02-20 19:26:30 -05:00
ZomgPonies
d6245903b0
Merge pull request #370 from Markolie/master
...
Changeling language fix
2015-02-20 19:20:07 -05:00
Markolie
ed21396340
Fix absorb language update
2015-02-21 01:15:25 +01:00
DZD
5e977cbfc9
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-20 19:05:25 -05:00
ZomgPonies
cfd9c09f0a
Adds COMIC mutation and gives it to clown
2015-02-20 18:43:09 -05:00
ZomgPonies
07cdcb3cff
Merge pull request #367 from Markolie/master
...
Switch copytext and sanitize proc
2015-02-20 16:22:32 -05:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
Mark van Alphen
243f1aec7b
Merge pull request #359 from Artorp/master
...
Change space law iframe wiki link
2015-02-20 20:37:34 +01:00
Mark van Alphen
e15fe8b6e0
Fix radio toggle
...
Changes:
1) Fixes the radio toggle.
2015-02-20 20:02:18 +01:00
Markolie
98fe1820a4
Disable typing indicator, fix radio toggle
2015-02-20 19:58:12 +01:00
Artorp
616cc2209f
Overhaul of canister variables
...
- Moves reference lists to their own datum
- Changes to nanoUI data gathering, large variables are no longer stored
on the atom
2015-02-20 19:56:58 +01:00
Artorp
ef2c939872
Change space law iframe wiki link
2015-02-20 19:20:21 +01:00
ZomgPonies
7e52595823
Merge pull request #358 from Markolie/master
...
Re-apply saycode
2015-02-20 12:15:43 -05:00
Markolie
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
Artorp
5d7d229861
Overhaul of canister variables
...
- Moves reference lists to their own datum
- Changes to nanoUI data gathering, large variables are no longer stored
on the atom
2015-02-20 16:23:43 +01:00
ZomgPonies
f27b2dcd9b
Merge pull request #345 from Artorp/spacepod
...
Added repair functionality to spacepods
2015-02-20 09:02:03 -05:00
Fox-McCloud
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
Tigercat2000
4345506c9c
Merge branch 'master' of github.com:ParadiseSS13/Paradise into FreezeMob
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-02-20 03:52:58 +01:00
DZD
2e848c2c37
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-19 20:59:41 -05:00
DZD
8193c0ab8e
Makes things compile
2015-02-19 20:47:57 -05:00
DZD
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
DZD
c11bb0d283
Fixes bugs
...
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
2015-02-19 19:32:58 -05:00
ZomgPonies
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
Markolie
bc31d1e234
Changeling language fix
2015-02-20 01:02:20 +01:00
Markolie
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
ZomgPonies
4be5819122
Merge pull request #339 from Fox-McCloud/Explosives
...
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
Artorp
8182592811
Fixed MouseDrop_T runtime error
...
runtime error: undefined variable /obj/spacepod/sec/var/stat
2015-02-19 15:20:28 +01:00
Artorp
9c926342d0
Spacepod: Added more feedback when interacting
2015-02-19 15:11:00 +01:00
Artorp
1c5eec9227
Added repair functionality to spacepods
...
- One welder use consumes 3 fuel and repairs 10 hull damage
- Fully repairing a sec spacepod requires around 40-42 activations,
welder must be refueled every 6 uses
2015-02-19 14:46:39 +01:00
Markolie
e4ff0bb168
Disable mecha short circuit sparks - lag inducing
2015-02-19 01:39:03 +01:00
Markolie
dad0b2d856
Fix AI tracking, karma message fix, karma say fix, robot storage sprite change
2015-02-19 01:05:00 +01:00
Fox-McCloud
1812a36113
Chem Boom Nerf
2015-02-18 17:13:58 -05:00
ZomgPonies
69a7d19380
Compile fix & Latejoin heads get added to target lists
2015-02-18 16:27:46 -05:00
DZD
a299793ab8
Makes code compile again
...
Fixing merge conflicts had the sideffect of adding one instance of
canremove, and one of drop_from_inventory.
2015-02-18 13:50:36 -05:00
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0
NODROP flag addition & handling
...
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Mark van Alphen
87ed05c146
Merge pull request #326 from Artorp/AutolatheQueue
...
Added queue functionality to the autolathe
2015-02-18 16:16:05 +01:00
Mark van Alphen
b407810e07
Merge pull request #324 from ZomgPonies/rev
...
New +MENTOR permission for mentors
2015-02-18 16:15:44 +01:00
Mark van Alphen
6e168cb020
Merge pull request #333 from ZomgPonies/master
...
Fix rev highpop feature
2015-02-18 05:05:29 +01:00
ZomgPonies
bb40f463e8
Hurr durr
2015-02-17 18:59:50 -05:00
ZomgPonies
97f80d0f5b
Merge pull request #323 from Fox-McCloud/Sounds
...
Sounds
2015-02-17 18:44:54 -05:00
ZomgPonies
7db0bf1d93
Fix rev highpop feature
2015-02-17 18:39:38 -05:00
Markolie
b5cf9bf51b
Cryokinesis fix
2015-02-18 00:32:52 +01:00
Mark van Alphen
175b7a2118
Merge pull request #318 from ZomgPonies/wishgranter
...
Modifies the wishgranter
2015-02-17 23:24:36 +01:00
Markolie
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01:00
