Commit Graph

200 Commits

Author SHA1 Message Date
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
# Conflicts:
#	code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Fox-McCloud
4b1bfe33ff Wall Rot Effect Refactor 2016-12-14 13:12:10 -05:00
Aurorablade
5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Markolie
182cd3a0de Fix catwalk/plating issue, update Experimentor grammar and remove disabilities from nuke ops 2016-11-02 13:17:35 +01:00
Aurorablade
1a6803c7bb Comments done mostly...Slughter demon whispers runtimes. 2016-10-27 20:44:54 -04:00
Aurorablade
0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04:00
Markolie
4858136ca1 Cult wall fix 2016-10-21 17:59:47 +02:00
Markolie
e853b66747 Minor wall deconstruction refactor 2016-10-21 17:05:49 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
GeneralChaos81
c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10:00
Aurorablade
335e123643 ever feel like you forgot something? 2016-08-22 03:18:42 -04:00
Aurorablade
15c23566eb time to deal with merge conflicts.... 2016-08-19 00:36:02 -04:00
Aurorablade
82abec0bd0 moar updates... 2016-08-18 19:49:31 -04:00
Aurorablade
47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
Norgad
6c844081d4 i can sprite
maybe
2016-08-12 18:03:16 +12:00
Crazylemon64
72febc9602 Merge branch 'master' of github.com:ParadiseSS13/Paradise into spacemanager_fix 2016-08-10 15:25:25 -07:00
Crazylemon64
b3df33962f Shuffles around BeforeChange 2016-08-08 00:07:12 -07:00
FreeStylaLT
6833ce0cc5 removes fox's comments 2016-08-07 12:49:44 +03:00
FreeStylaLT
772fbd2136 Patched up holes I missed, moved coated rwall to walls_misc.dm 2016-08-06 15:27:48 +03:00
FreeStylaLT
f52d0378e9 adds progress bar to coating, cleans up text 2016-08-02 18:21:49 +03:00
FreeStylaLT
51dff7dd63 disco inferno 2016-08-02 02:18:27 +03:00
Fox-McCloud
95dcbbc77b cleaning up old code 2016-07-29 18:01:59 -04:00
Aurorablade
389a2be672 its getting hot in here.... 2016-07-27 02:26:19 -04:00
Aurorablade
2d69f019ca SALTSALTSALTSALTSALTSALTSALTSALTSALT
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2016-07-24 17:12:03 -04:00
Aurorablade
53e5e598ea i managed to mess up cult datum picking again...AGAIN... 2016-07-23 22:11:13 -04:00
Aurorablade
bb840f4dce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-07-21 23:56:34 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the
map loader to safely load templates mid-run
2016-07-07 23:52:44 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Matt Milosevic
bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
Aurorablade
e1dc621ab8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-01 00:12:37 -04:00
Tastyfish
7efe0beb94 Fixes a few runtimes 2016-05-23 19:23:18 -04:00
Aurorablade
f99a8141c5 TG Ports and datum cult screwups 2
I may have missed something
2016-05-11 20:15:36 -04:00
Fox McCloud
ff27b4f77a Merge pull request #4263 from Tastyfish/smooth-shuttles
Fixes shuttle smoothing
2016-04-21 22:58:49 -04:00
Tastyfish
198656874d Fixes shuttle smoothing 2016-04-21 21:35:53 -04:00
Fox-McCloud
2954aa88ea abductor tech 2016-04-18 19:17:46 -04:00
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Crazylemon64
fa14522a1f Makes a different, more fragile, floor type for the metal foams 2016-03-18 20:12:27 -07:00
Tastyfish
d189d70f4a Adds tranquillite
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05:00
Fox McCloud
f2a26982cf Merge pull request #3708 from Tastyfish/zebra-plates
Fixes custom plating style issues
2016-02-26 03:19:46 -05:00
Tastyfish
236765ea9c Fixes custom plating designs 2016-02-25 21:25:11 -05:00
Tastyfish
35501c6dac Fixes crowbarring floors without floor_tile types 2016-02-25 19:35:24 -05:00
Tastyfish
677ebfbb9d Fixed catwalks dropping wrong amounts 2016-02-16 19:17:57 -05:00
Crazylemon64
806ee1f9c3 Makes it painfully obvious not to use plain old /turf/simulated/floor
Probably will make some mapping look weird, but that floor doesn't behave
properly - will react to crowbar, but won't actually yield tiles, for
example
2016-02-12 04:18:29 -08:00
Crazylemon64
bcdaedb01e Walls will now smooth and explode properly 2016-02-08 23:08:36 -08:00
Tastyfish
ec2e80ea65 Fixed airless floor being plasteel airless floor 2016-01-23 08:43:03 -05:00