cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,416 Commits 26 Branches 2 Tags
69e0eedead012bbcd95d8a135fe39e3d63bb9287
Commit Graph

2163 Commits

Author SHA1 Message Date
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
tigercat2000
17fd8e8a6a Merge pull request #8819 from Kyep/syndi_outfit_boots 
Improves admin outfits, fixes magboots, adds special antags
 2018-04-16 18:28:03 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Kyep
c1bf2382b8 squash 2018-04-08 08:05:31 -07:00
Kyep
2cb4e1f75c Fox requests 2018-04-08 08:03:34 -07:00
Fox McCloud
f9421e3b22 explicit return 2018-04-07 23:41:29 -04:00
Fox McCloud
196d0b90f9 Makes Records GC (most of the time) 2018-04-07 23:38:10 -04:00
Kyep
ca8bb33a58 Tiger requests 2018-04-07 14:01:48 -07:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port 
# Conflicts:
#	paradise.dme
 2018-04-03 18:21:04 -04:00
Fox McCloud
fe2365590f move the datum vars 2018-04-03 00:29:28 -04:00
Kyep
99c3c38b19 deletes ancient vampire, due to an icon bug, may re-add in another pr later 2018-04-01 22:14:01 -07:00
tigercat2000
27dceb6131 Merge pull request #8613 from shazbot194/E-pistols 
Adds in energy pistols
 2018-04-01 20:42:42 -07:00
shazbot194
adcf2dcada Merge fix 2018-04-01 19:17:48 -08:00
tigercat2000
f6dad122ba Merge pull request #8357 from Aurorablade/VirusNostolgia 
Wherein Fethas proves to be evil incarnate
 2018-04-01 19:22:31 -07:00
Kyep
2e33456c20 fixes wiz boots, adds ancient vamp, archwiz, nt undercover ops 2018-03-31 19:01:21 -07:00
Fox McCloud
7f842e3223 no more runtimes 2018-03-29 00:44:53 -04:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Kyep
275c2ffc3c syndi officers get red beret, lighter, cigar 2018-03-27 17:08:42 -07:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Kyep
e014f02324 Improves admin outfits, fixes magboots being missing 2018-03-26 15:44:17 -07:00
tigercat2000
7ac8dc037f Merge pull request #8791 from alexkar598/icon_override 
Allows item_action to not use the item icon by adding a var to let it not do so
 2018-03-26 14:16:47 -07:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC 
# Conflicts:
#	code/__DEFINES/flags.dm
 2018-03-22 15:35:12 -07:00
alexkar598
ad97972038 Adds a var to not use item icons and insteed use the icon supplied in the subtype,defaults to using the item icon.Also removes empty file 2018-03-22 16:19:38 -04:00
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks 
[READY] Attack Code Update
 2018-03-22 11:55:53 -07:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium 
Nanocalcium: Bone repair drug.
 2018-03-19 13:37:20 -07:00
tigercat2000
6e9ee2e822 Revert ".357 nukie price fix" 2018-03-19 13:15:01 -07:00
tigercat2000
3a6cc2557e Merge pull request #8737 from shazbot194/357_price_fix 
.357 nukie price fix
 2018-03-19 13:14:32 -07:00
shazbot194
674176f0c3 Adds in a nukie only 357 2018-03-06 19:52:17 -09:00
uraniummeltdown
a2038d40b3 makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps 
added a few defines and helpers
do_after family supports callbacks
added airlock security levels to airlocks
obj_integrity for doors, door assemblies, firelock frames
vault door assembly is 8 plasteel up from 6
explosion_block works better
heavy firelocks block explosions, firelock (de)construction uses crowbar instead of welder
xenos can open airlocks
minor change to attacking obj message
 2018-03-04 13:52:55 +05:00
tigercat2000
087457fa9b Merge pull request #8675 from Serkket/001 
Bug-B-Gone
 2018-03-03 09:28:12 -08:00
tigercat2000
47cd4cb127 StonedMC 
This commit ports the StonedMC from /tg/station, intended to replace the
Process Scheduler from goon. Currently, they exist simultaneously, as
it's very difficult to port our 22 processes to the SMC all at once.
Instead, we can make them work together until everything is converted
over at a later point, and then take the old PS out back and put a
couple of rounds into it's deformed skull.

Primary benefits of this new process controller include: Other people
that can actually maintain it, unlike the PS, pre-world-init
initialization for subsystems, ease of ports from /tg/station13, and
potential performance improvement (to be seen).
 2018-03-02 21:12:49 -08:00
Birdtalon
fe914dc5f5 finishes effects, adds nanocalcium auto-injector, adds bone repair kit to uplink. adds sprites. 2018-02-21 20:44:03 +00:00
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral 
Titanium
 2018-02-21 03:20:20 -05:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff 
Buffs IEDs
 2018-02-19 21:45:05 -08:00
Fox McCloud
1e1146cd21 changes 2018-02-20 00:33:22 -05:00
Serket
00d501c7df BugBGone 2018-02-10 12:26:30 -07:00
uraniummeltdown
369c654c70 moves material defines to construction.dm 
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
 2018-02-06 01:24:36 +05:00
Aurorablade
a0540814b0 THE VAR IS ROGUE 
BLOW THE VARS
 2018-02-02 01:55:31 -05:00
Aurorablade
061cbcfaf2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MOREDOTS 2018-02-02 01:26:12 -05:00
Aurorablade
cbc446a479 it works tiger pants 2018-02-02 00:31:19 -05:00
tigercat2000
ebe366fd67 Merge pull request #8403 from Aurorablade/FollowThePath 
Ports some hud updates from TG
 2018-02-01 19:56:51 -08:00
Aurorablade
07452c6818 tweaks 2018-02-01 22:33:10 -05:00
shazbot194
e6cbce1eaa Makes it just the mini 2018-01-28 19:07:49 -09:00
shazbot194
980d452f1c Adds in the energy pistol 2018-01-27 14:33:28 -09:00
uraniummeltdown
134ad47f80 p_open -> panel_open 2018-01-23 18:10:57 +05:00
tigercat2000
696136b579 Merge pull request #8565 from uraniummeltdown/repathvisual 
effect/temp_visual update
 2018-01-20 11:25:08 -08:00
uraniummeltdown
6f20017153 spacing 2018-01-21 00:17:52 +05:00
tigercat2000
4830015bc4 Merge pull request #8550 from uraniummeltdown/tables 
Table Construction Overhaul
 2018-01-18 22:12:57 -08:00
uraniummeltdown
f1577b43f7 ethereal jaunt water effect won't show during wraith jaunt 
removed unnecessary icon var settings
 2018-01-18 22:25:34 +05:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00