Kyep
102ff67095
fixes merge conflict
2018-08-01 04:13:22 -07:00
Crazy Lemon and GitHub
c9fb3a22f7
Merge pull request #9165 from alexkar598/nerfs-the-pods
...
Pods are no longer miniguns
2018-07-11 13:56:55 -07:00
alexkar598 and GitHub
ba9646fa16
Update equipment.dm
2018-07-03 05:30:40 -04:00
MINIMAN10000
17a4d52101
not do_after, not equal concious, warn pilot if there is one
2018-07-02 11:09:35 -07:00
alexkar598 and GitHub
05674ccc00
Update equipment.dm
2018-07-02 07:28:30 -04:00
alexkar598 and GitHub
5ae7032120
Update equipment.dm
2018-07-02 07:22:43 -04:00
MINIMAN10000
288c16df1b
Restrained spacepod passanger can now exit pod after 2 minutes
2018-07-02 00:38:06 -07:00
Kyep
c03a921308
squash
2018-06-17 07:54:17 -07:00
Kyep
8ba5bdd276
syndi pod desc tweak
2018-06-17 00:42:42 -07:00
Kyep
4d4eb16a3a
fixes merge conflict
2018-06-06 16:32:31 -07:00
tigercat2000
5ace5944d9
Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings
2018-05-31 19:34:47 -07:00
Kyep
08fdc2bce3
merge conflict fix
2018-04-25 23:48:44 -07:00
Fox McCloud
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
Fox McCloud
49fcd92040
pod fabricator
2018-04-22 18:23:27 -04:00
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
Kyep
1b6b1deecc
fixes merge conflict in custom_grenades.dm
2018-04-01 18:59:25 -07:00
Fox McCloud and GitHub
96fc4aba1c
Merge pull request #8671 from Aurorablade/PodFluff
...
Fluff Item: Decemviri
2018-03-12 15:58:39 -04:00
Kyep
5f2ef09a13
fixes merge conflict with bureaucracy.dmi
2018-03-01 19:12:10 -08:00
florodude
4376f8f974
fixes #8680
...
Changed frabricated to fabricated.
2018-02-15 00:05:36 -06:00
Aurorablade
11872315ee
tiger changes
2018-02-10 00:45:55 -05:00
Aurorablade
3bdecb4e54
spacepodfluff
2018-02-09 22:34:17 -05:00
Mars
74ae208bf6
Better wording+span ending
...
Added a few missing </span> and rewording of the application of the pod
lock buster on a locked pod without lock, and trying to lock a pod
without a locking system.
2018-01-24 22:09:53 +01:00
Mars
66838caa8b
Fixes pod lock buster and locking without locks
...
Ensures pods are only locked when there is a pod lock, and let's pod
lock busters unlock the pod, and not jusre destroy a lock. Also minor
typo correction and replacing a 1 used as boolean with TRUE
2018-01-23 20:01:37 +01:00
Kyep
623da07147
cleanup, syndipod
2018-01-05 03:46:55 -08:00
Kyep
59d9f26687
v1
2017-11-30 18:52:23 -08:00
tigercat2000 and GitHub
77810081e7
Merge pull request #8331 from uraniummeltdown/effectfiles
...
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
2017-11-26 12:35:01 -08:00
tigercat2000
b4fa39d940
512 Compilation & Travis
2017-11-11 09:50:21 -08:00
uraniummeltdown
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
Fox-McCloud
e3d425aae3
eh
2017-07-26 16:29:05 -04:00
Fox-McCloud
b12baedada
ok there TG, let's let BYOND do something better...
2017-07-25 20:50:16 -04:00
Fox-McCloud
f78c507122
Sound Update/Refactor
2017-07-25 20:35:38 -04:00
Fox McCloud and GitHub
3e065e730e
Merge pull request #7554 from SamHPurp/more-qdel-nulls
...
Uses more QDEL_NULLs
2017-06-19 21:14:39 -04:00
Sam
d0dde4f3d7
Uses more QDEL_NULLs
2017-06-15 00:49:00 +01:00
Sam
86d8d288fa
Fixes more typos and missing full stops in descs...
2017-06-14 08:06:31 +01:00
Sam
4d57fff5c9
Updates Intents
2017-06-10 09:43:36 +01:00
tigercat2000
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf
Converts /modules/ to using WEIGHT_CLASS_x
2017-05-28 01:25:09 +01:00
Tayyyyyyy
a1ceab2afc
Purge \the
2017-04-28 21:24:18 -05:00
Tayyyyyyy
41157283cc
Notify user when cell inserted into spacepod
2017-04-27 05:10:26 -05:00
Tayyyyyyy
8d512e7554
Inline incapacitated check
2017-04-22 22:05:53 -05:00
Tayyyyyyy
53bff427f7
Prevent incapacitated people from using space pod verbs
2017-04-21 23:37:44 -05:00
Markolie
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Crazy Lemon and GitHub
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
Fox-McCloud
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
Fox-McCloud
183702a36e
fix up 2.0
2017-04-02 00:38:14 -04:00
Fox-McCloud
838d58b1a5
for fixes
2017-03-28 01:06:03 -04:00
Mark van Alphen and GitHub
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Mark van Alphen and GitHub
b0ded4b821
Merge branch 'master' into findnreplace
2017-03-05 12:09:52 +00:00
Markolie
c5b897a951
Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers
2017-02-22 18:24:43 +01:00