cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,308 Commits 26 Branches 2 Tags
c514b4e34af8ec81765a2cd14a51a373fd38388a
Commit Graph

202 Commits

Author SHA1 Message Date
variableundefined
682e7b453e Merge pull request #10948 from datlo/hijackprisonners 
Allow hijackers to take hostages
 2019-03-03 22:37:48 +08:00
datlo
8ec8081fcf removed commented code 2019-02-26 00:34:31 +00:00
datlo
24ef06d249 Allow hijackers to take hostages 2019-02-25 14:29:58 +00:00
datlo
abdf1128cb restrict ERT shuttle to station zlevel 2019-02-11 17:06:49 +00:00
datlo
cb6230f332 add ERT docker, map in changes 2019-02-11 16:58:24 +00:00
datlo
420eb1a51b fix camera being stuck in your shuttle 2019-02-11 14:15:39 +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
3c42aa093f prevent navconsole from spying inside the station 2019-02-07 00:42:09 +00:00
datlo
e27e334b91 add sprites by Ionward 2019-02-06 21:20:40 +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
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
void*
8b8cfdaadb Reworked discord interface to replace the IRC one completely 2019-01-06 18:00:28 +01:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05: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
Certhic
e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
Purpose
b2fc276158 Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements 2018-10-13 21:34:04 +01:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
3667426fd5 Merge pull request #9772 from SamHPurp/mouse-opacity-define 
Creates mouse_opacity defines
 2018-10-09 08:25:55 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Citinited
9e04ff56ec Syndicate shuttles have unique circuitboards now 2018-10-08 22:43:00 +01:00
Purpose
d335a5a4ce Subsystem created... works! 2018-10-06 20:05:02 +01: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
bbca113d1b Update README.md properly 2018-09-04 15:15:38 +08: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
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