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
40,491 Commits 26 Branches 2 Tags
1aa33c97ea3807c1bc31c8519eabed1f97a00e10
Commit Graph

29800 Commits

Author SHA1 Message Date
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
tigercat2000
b0c1033d51 Fix humans layering over other objects incorrectly 2018-10-25 16:07:00 -07:00
tigercat2000
0c67ee398a Move lighting to it's own plane, fix observers 2018-10-25 15:48:03 -07:00
tigercat2000
bd744965b0 But legitimately /tg/ icons 2018-10-25 12:58:06 -07:00
tigercat2000
8dc88cb80b Closer to working 100% 2018-10-25 01:48:51 -07:00
tigercat2000
1f9fc0a7fb SSoverlays for human icons, mostly works 2018-10-25 01:07:27 -07:00
variableundefined
d6c442caa5 Merge pull request #9950 from Dave-TH/surgery_tray 
Surgical Trays
 2018-10-25 14:27:04 +08:00
variableundefined
4889c3a1a5 Merge pull request #9081 from tigercat2000/multivis 
PiP Multivis
 2018-10-25 09:45:02 +08:00
variableundefined
0e46797cf1 Merge pull request #9963 from farie82/Tablet-fix 
Fixed the tablet being spawned with the broken sprite
 2018-10-25 07:35:03 +08:00
variableundefined
dee8334e28 Merge pull request #9964 from Certhic/borgHeal 
fix runtime CureIfHasDisability and borg repair
 2018-10-25 07:19:39 +08:00
variableundefined
f0535dbcb9 Merge pull request #9958 from dovydas12345/data-disk 
Adds data disk to research designs
 2018-10-25 07:18:26 +08:00
variableundefined
3a980bc95f Merge pull request #9965 from warior4356/Safe-Refactor 
Fixed safe noises
 2018-10-25 07:16:39 +08:00
warior4356
7d5cb5a216 Fixed safe noises 
Fixed unlock noises coming from tumbler 2 on every turn of tumbler 1, once tumbler 2 was unlocked.
 2018-10-24 15:45:10 -07:00
Certhic
27b0b7939f fixes borg healing 2018-10-25 00:36:42 +02:00
Certhic
10795c9c7a fixes a rejuvenate runtime 2018-10-25 00:10:10 +02:00
joep van der velden
7617275b02 Fixed it 2018-10-24 22:54:14 +02:00
variableundefined
781109e11b Merge pull request #9962 from Birdtalon/reformatting 
Reformats assembly.dm and proximity.dm
 2018-10-24 21:51:38 +08:00
variableundefined
b98766ec15 Merge pull request #9961 from lass9030/medical-runtime 
Runtime fix
 2018-10-24 21:48:05 +08:00
dovydas12345
a8b0bbae47 Better name and extra requirements! 2018-10-24 14:35:12 +03:00
Birdtalon
941e9b49cf reformats assembly.dm and proximity.dm 2018-10-24 11:24:58 +01:00
lass9030
213f896891 H.mind check 2018-10-24 11:41:48 +02:00
Aurorablade
654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
tigercat2000
13a095ec4a Fix atom init again 2018-10-23 18:48:56 -07:00
tigercat2000
88a051e5dc Roll the damn changes back, init works now 2018-10-23 17:48:22 -07:00
tigercat2000
8ef1b97f45 Merge remote-tracking branch 'upstream/master' into multivis 
# Conflicts:
#	.travis.yml
#	_maps/map_files/MetaStation/z2.dmm
#	_maps/map_files/cyberiad/z2.dmm
#	code/game/atoms_movable.dm
#	code/game/machinery/camera/camera.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/ai/freelook/eye.dm
 2018-10-23 17:41:41 -07:00
tigercat2000
fb08ded489 Merge pull request #9934 from lass9030/reaction-scaling 
Reaction scaling
 2018-10-23 17:19:13 -07:00
tigercat2000
917e4f89e2 Merge pull request #9954 from variableundefined/WinRateTrack 
Add in shadowling win rate tracking & improve parsability of other round win rate tracking
 2018-10-23 17:10:26 -07:00
tigercat2000
a0d2e1b498 Merge pull request #9955 from variableundefined/FixReagent 
Fix reagent dispenser getting attack cooldown
 2018-10-23 17:06:43 -07:00
variableundefined
9de64fa8c7 Better fix 2018-10-24 06:53:31 +08:00
dovydas12345
45aab00dbf Update misc_designs.dm 2018-10-23 22:22:17 +03:00
dovydas12345
3cfc7a42fe Adds data disk to misc designs 2018-10-23 22:22:07 +03:00
lass9030
c76f5dc2a9 container 2018-10-23 20:17:35 +02:00
variableundefined
b07dab729c Fix reagent dispenser getting attack cooldown 2018-10-23 21:54:46 +08:00
variableundefined
0ddd639bb2 Merge pull request #9938 from Fox-McCloud/destroy-reagents 
Helps Reagents GC Better
 2018-10-23 20:49:30 +08:00
variableundefined
d3d112acf7 Improve win rate tracking for internal playerbase. Add in shadowling win rate tracking. 2018-10-23 17:53:50 +08:00
Dave
12389125aa Review Concerns 2018-10-22 18:54:41 -04:00
Unknown
1cd8d2f98f Surgical Trays 
Adds Surgical Trays
 2018-10-22 17:37:51 -04:00
tigercat2000
48224341ae Merge pull request #9943 from Certhic/autopsy-scan-unresponsive-fix 
fix: autopsy scanner unresponsiveness
 2018-10-22 11:19:41 -07:00
tigercat2000
7a289c10b3 Merge pull request #9485 from variableundefined/ComponentFixesPort 
Port over TG component improvements.
 2018-10-22 10:50:33 -07:00
tigercat2000
186d9db566 Merge pull request #9947 from alex-gh/uplink_better_logging 
Removed logging ambiguity for uplink purchases.
 2018-10-22 10:35:28 -07:00
tigercat2000
b33de0c7b0 Merge pull request #9939 from SamHPurp/revolution-spawn 
Removes a revolution spawn
 2018-10-22 10:34:27 -07:00
tigercat2000
2cc0958529 Merge pull request #9941 from SamHPurp/sdql-typo 
Fixes typo in a warning message
 2018-10-22 10:34:01 -07:00
alex-gh
04c259b887 Removes logging ambiguity for uplink purchases. 2018-10-22 16:44:58 +02:00
Alonefromhell
8a023482a4 ++ =/= + 1 2018-10-22 14:38:40 +02:00
variableundefined
2c4bd89f41 Merge pull request #9940 from SamHPurp/nuclear-unused-proc 
Removes unused proc in the Nuclear gamemode
 2018-10-22 07:10:30 +08:00
variableundefined
cd677b6ef3 Merge pull request #9870 from SamHPurp/arrays-start-at-1-yo 
Fixes a cause of lag in the timer subsystem
 2018-10-22 07:07:25 +08:00
tigercat2000
7ae10e2168 Merge pull request #9937 from SamHPurp/empty-icon-files 
Removes some empty icon files
 2018-10-21 15:58:13 -07:00
Certhic
e8597c897d removed unused pretend weapon code 2018-10-21 21:04:01 +02:00
Certhic
b5e8e5e88f fix: autopsy scanner unresponsiveness 2018-10-21 20:41:32 +02:00
Purpose
ecb466507e super important 2018-10-21 18:23:55 +01:00