cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,597 Commits 26 Branches 2 Tags
f7dcde22d781fd0bc0db35b51cd168b53075dba9
Commit Graph

91 Commits

Author SHA1 Message Date
datlo
cb6230f332 add ERT docker, map in changes 2019-02-11 16:58:24 +00:00
datlo
2393977c33 moar deconflicting 2019-02-11 13:47:09 +00:00
datlo
c57ec440e1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2 
# Conflicts:
#	code/modules/shuttle/shuttle.dm
 2019-02-11 13:31:37 +00:00
datlo
b27584d6e3 deconflicting 2019-02-11 13:30:39 +00:00
datlo
0805b89ea7 Update access denied message 
the old message would make you think you need a golem id or somethin
 2019-02-07 14:27:38 +00:00
datlo
91ef2d7be2 it's alive 2019-02-06 20:01:30 +00:00
datlo
912c6b0b9e asteroid claim improvements, golem ship security 
Add plating over asteroid tiles if you've claimed them

Asteroid walls can now be used to define rooms (still must be airtight)

Add golem check to the free golem ship
 2019-02-03 15:59:04 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
Kyep
14809873b1 removes docking request system, remaps shuttle, removes offstation docking port 2018-12-08 15:37:53 -08:00
datlo
0d62b7d07c Syndicate office functional, fix CC mech chargers 2018-12-07 14:45:52 +00:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose
ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
tigercat2000
5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07: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
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Kyep
322dc17154 deletes from shuttle controller, squash 2018-04-01 21:59:12 -07: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
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05: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
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
Fox McCloud
b35eb8e96f Merge pull request #6086 from tigercat2000/shuttle_hijack 
Hijacking a shuttle diverts it to the syndicate outpost
 2017-02-08 10:05:34 -05:00
Tigercat2000
5e8c14789b Merge remote-tracking branch 'upstream/master' into shuttle_hijack2 2017-02-05 07:41:14 -08:00
Kyep
4e586e0db4 Fixes ERT and SST shuttle accesses 2017-02-02 17:47:21 -08:00
Tigercat2000
22af92ad22 Hijacking a shuttle diverts it to the syndicate outpost. 
tgstation/tgstation#22184

 - Hijacking the shuttle will make it dock to a new dock on the
 syndicate outpost.
 - Fixed shuttle_master not calling mobile/dockRoundstart().
 - Only Traitors, Changelings, Vampires, Nuclear Operatives, and
 Syndicate Deathsquads can now hijack the shuttle.
 2017-01-06 10:08:00 -08:00
Markolie
1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/_globalvars/lists/objects.dm
 2016-12-31 17:54:06 +01:00
Aurorablade
0bb62ebb36 everything works thanks to our tiger overlords.. 2016-12-12 23:59:37 -05:00
Aurorablade
c5e6c9323b addresses mrrowl comments 
still haveing shuttle load issues after first one is loaded..
 2016-12-11 23:11:21 -05:00
Aurorablade
2285f40a88 ...okay soe ikea shuttles are back on new template loads 2016-12-09 22:23:12 -05:00
Aurorablade
a53a716bd2 ....Well i fixed IKEA shuttles anyway.... 
now just to fix docking templates without force docking it.
 2016-12-05 22:07:54 -05:00
Markolie
ffc74cda0a Announcement fixes, change most command announcements to event announcements 2016-10-25 15:21:16 +02:00
Aurorablade
ee1482b9b2 THE HACKS HURTS US PRECIOUS 2016-09-27 01:06:48 -04:00
Aurorablade
96a0e3cbb2 now shit just isn't fucking undocking... 2016-09-22 18:04:42 -04:00
Aurorablade
d6932a737f yes i have debug print...shhhhh 2016-09-22 11:18:13 -04:00
Aurorablade
dee83ef62e ALL HAIL LEMONS 2016-09-22 02:00:04 -04:00
Aurorablade
2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Aurorablade
c54372784a fixes all but one runtime... 2016-08-31 21:16:20 -04:00
Aurorablade
65d1c781c8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-26 21:54:56 -04:00
Aurorablade
f8197f3938 removed some shit new runtimes. 2016-08-18 02:13:34 -04:00