tigercat2000
5ace5944d9
Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings
2018-05-31 19:34:47 -07:00
tigercat2000
7fb8f8d76c
Merge remote-tracking branch 'upstream/master' into more_ss_ports
...
# Conflicts:
# paradise.dme
2018-04-30 09:27:11 -07:00
Fox McCloud
510c5b4268
fixes
2018-04-29 00:53:13 -04:00
tigercat2000
7d8c9a731a
SS Conversion: Atoms, Machines, n' Mobs
...
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
Fox McCloud
cfe182a1f7
Ports over Timer Subsystem
2018-04-28 20:26:04 -04:00
Fox McCloud
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
tigercat2000
367ed46b79
Merge pull request #8618 from Kyep/xeno_window
...
Deletes Xenobio SIT docking port
2018-04-06 20:13:37 -07:00
Kyep
322dc17154
deletes from shuttle controller, squash
2018-04-01 21:59:12 -07:00
Fox McCloud
22dc6860b3
Ports TG's Garbage Subsystem
2018-03-28 20:02:39 -04:00
Fox McCloud
5701ea7c75
Ports Nano UI to Subsystems
2018-03-26 23:59:52 -04:00
tigercat2000
b14faa19c3
Merge remote-tracking branch 'upstream/master' into SMC
...
# Conflicts:
# code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
uraniummeltdown
8f26d5b8b6
rename __DEFINES/mob.dm to __DEFINES/mobs.dm
...
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +05:00
tigercat2000
dca16e60cf
PS -> SMC Ports: LINDA, Spacedrift, Throwing
...
This commit ports LINDA, spacedrifting, and throwing to the SMC.
2018-03-02 23:58:57 -08:00
tigercat2000
bd50420a50
Merge pull request #8664 from RyanSmake/muhspessnamez
...
We don't need 5 separate variables to know which station we are on, take two
2018-02-09 13:18:22 -08:00
Bxil
434cbfdb27
Cargo shuttle station name
2018-02-09 07:53:12 +01:00
uraniummeltdown
c89b1e8463
repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2018-01-18 13:03:49 +05:00
uraniummeltdown
73d7af2675
moves var/can_deconstruct to obj level
...
moves proc/deconstruct() and proc/take_damage() to obj level, moves a few obj damage procs in with it to new obj_defense.dm
moves plastic flaps to new plasticflaps.dm
2017-12-26 18:16:42 +05:00
tigercat2000
8a588d3aad
Merge remote-tracking branch 'upstream/master' into radio_comms_fluff
2017-10-26 12:02:31 -07:00
Citinited
cd5ba823f2
Shuttles will now only close airlocks when moving
2017-10-15 23:02:58 +01:00
Sam
9eb092555d
karma karma karma karma chameleon....
2017-08-04 15:29:18 +01:00
tigercat2000
cd72dcd8a1
Air Traffic Control & Map Lore
...
Air Traffic Control from Polaris. Every TBD to TBD minutes, a radio
exchange happens between a ship and Cyberiad Space Control, ranging from
system transfer permission to declaring an emergency.
Refactored MAP_NAME into /datum/map files. This also allows for built-in
map lore (really just the name and system, which is only used for ATC).
Secondary commit will adjust all of the lore to match our own instead of
Polaris's.
2017-06-28 16:12:15 -07:00
Citinited
c31b0fcadf
Merge branch 'master' into bad-karma
2017-06-10 19:16:13 +01:00
Citinited
cc7c4869b9
Actually fixes karma upon end-round shuttle
2017-06-10 18:59:45 +01:00
Fox McCloud
1a87a8a55b
Merge pull request #7513 from Citinited/karma-fix
...
Fixes the karma message popping up when you disconnected but had already spent karma
2017-06-10 00:16:51 -04:00
Fox McCloud
b982080f16
Merge pull request #7258 from KasparoVy/cloning-crating-and-closeting
...
Fixes Some RCS Issues
2017-06-09 19:23:42 -04:00
Citinited
2b92d57b93
Fixes karma message popping up when you disconnected
2017-06-09 19:33:24 +01:00
KasparoVy
3834746136
Fixes #7243 , RCS No Longer Teleports Crates/Closets to CC on Cargo Shuttle
2017-06-08 19:58:27 -04:00
tigercat2000
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
Sam
b7c87c041b
Removes roundend karma reminder
2017-05-18 01:27:10 +01:00
Sam
039a2d07ac
Revert "Adds a preference option"
...
This reverts commit fd850a6e1e
2017-05-17 23:51:08 +01:00
Sam
fd850a6e1e
Adds a preference option
2017-05-08 13:15:28 +01:00
Sam
27f5455a32
...adds the message.
2017-05-07 19:58:58 +01:00
Sam
5b0f085b70
Adds karma reminder while shuttle in flight
2017-05-07 19:58:35 +01:00
Fox McCloud
0fff889f92
Merge pull request #6582 from Aurorablade/Ripple
...
Don't Stand Under Shuttles
2017-05-01 19:47:50 -04:00
Aurorablade
66e81c90d4
Fox tweaks
2017-05-01 18:54:34 -04:00
Aurorablade
b79269259b
fox tweaks
2017-04-29 02:39:14 -04:00
davipatury
8963e96c41
effect/spider to structure/spider
2017-03-27 19:01:25 -03:00
davipatury
550fdd3ae3
effect/blob to structure/blob
2017-03-27 18:41:19 -03:00
uraniummeltdown
6d27ce0a62
added 10% chance for random crate to be added to supply shuttle on calling it to station
2017-03-18 11:19:31 +04:00
uraniummeltdown
d9dd77327a
increased time, wirecutter is now a welder
2017-03-14 18:21:21 +04:00
uraniummeltdown
dedc33a23f
decon time 15 -> 26
2017-03-12 17:57:30 +04:00
uraniummeltdown
85260a72ba
plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines
2017-03-12 06:09:29 +04:00
Aurorablade
b16d609e59
Thanks jedr
2017-03-03 18:13:08 -05:00
Aurorablade
8248056b83
Revert "Sprite change"
...
This reverts commit 003d588e85
2017-02-25 11:13:08 -05:00
Aurorablade
003d588e85
Sprite change
2017-02-25 02:18:45 -05:00
Aurorablade
c5bb917b66
Don'tStandUnderShuttles
2017-02-24 01:42:13 -05:00
davipatury
d4338bed12
Some changes!
2017-02-18 22:18:01 -02:00
davipatury
f1ae2e3f3a
Shuttle Console nano-ui.
2017-02-18 20:49:38 -02:00
Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
