cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 18:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,014 Commits 26 Branches 2 Tags
987a451005908f43c70c762cdfefe25cbdaae618
Commit Graph

18564 Commits

Author SHA1 Message Date
variableundefined
987a451005 Enables the alien screen for AI 2018-11-10 19:44:49 +08:00
variableundefined
1eefe3f83d Merge pull request #10164 from Citinited/infinite-metal-exploit 
Fixes an infinite metal exploit
 2018-11-10 11:44:04 +08:00
Citinited
b07af660ed Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500, 2018-11-09 23:18:54 +00:00
variableundefined
a03d0323ed Merge pull request #10046 from warior4356/Drill 
Thermal Drill
 2018-11-09 17:11:36 +08:00
Citinited
83173b1077 Ghosts and other anchored mobs can no longer speed up conveyors 2018-11-09 00:35:33 +00:00
variableundefined
3ac1bb0cc2 Merge pull request #10160 from Dave-TH/space_transition 
Gives Space a Name
 2018-11-09 07:41:50 +08:00
Citinited
8eb598c38c Fixes infinite metal exploit 2018-11-08 22:45:37 +00:00
Unknown
9c06d5ce82 We now name space 2018-11-08 14:01:11 -05:00
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
tigercat2000
97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel 
[READY] Port Fel's fermentation barrel from tg
 2018-11-07 23:09:08 -08:00
variableundefined
a4812dd4e7 Update fermenting_barrel.dm 2018-11-08 14:57:56 +08:00
tigercat2000
a38cab96fe Merge pull request #10076 from variableundefined/Addcards 
Add baycards to maps, loadouts & prize.
 2018-11-07 22:53:29 -08:00
variableundefined
3cd1256bdc Merge pull request #10142 from datlo/ttvbomb 
Adds the toxins payload casing to crafting
 2018-11-08 14:18:19 +08:00
variableundefined
3c40e55658 Merge pull request #10115 from Citinited/intensive-conveyor-unit 
Makes conveyors less greedy
 2018-11-08 14:12:14 +08:00
variableundefined
1a388848bf Merge pull request #10074 from tigercat2000/mechastuff 
/tg/ Mecha - Part 2, Action Buttons!
 2018-11-08 13:12:41 +08:00
variableundefined
bb24b0f8b6 Merge pull request #10153 from Eniraz/logic-gates 
Fixes broken logic gates
 2018-11-08 13:02:38 +08:00
joep van der velden
469832b0d2 Mining bots now work upon being health upgraded 2018-11-07 20:23:46 +01:00
Eschess
b03141861f Update code/modules/logic/dual_input.dm 
this should fix the broken logic gates
 2018-11-07 19:24:28 +01:00
Citinited
13b776b51c Adds timer to conveyors; checks speed_process before trying to change to / from speed process 2018-11-07 18:20:05 +00:00
variableundefined
69a98f9c5a Merge pull request #10149 from TDSSS/value-pak-fix 
Added mulebot control to captain's pda again
 2018-11-07 22:29:55 +08:00
TDSSS
9a21e60fb5 Added mulebot control to captain's pda again 2018-11-07 13:14:58 +01:00
variableundefined
52a9f5da89 Merge pull request #10148 from Squirgenheimer/skipantagfixpart2 
Follow up PR: adds skip_antag check to one_click_antag
 2018-11-07 13:05:42 +08:00
Squirgenheimer
47fb8715a1 adds skip_antag check to one_click_antag 2018-11-06 23:51:45 -05:00
variableundefined
9902475071 Merge pull request #10133 from alex-gh/exotic_blood_fix 
Fixes exotic blood not working.
 2018-11-07 08:16:24 +08:00
Spartan6
46a5ad9e7f Ansari's changes 2018-11-06 23:45:49 +00:00
Spartan6
778e55d576 Fixes bluespace crystals deleting entire stack 2018-11-06 22:37:10 +00:00
datlo
383a331f46 Adds the toxins payload casing to crafting 
Adds a new type of bomb payload : The toxins payload. Crafted with a
matter bin, metal, and a remote signaller, it must be loaded with a tank
transfer valve and put into a plasteel bomb casing in order to do
anything. Once the bomb detonates, the toxins payload will open the TTV
(causing an explosion if the mix is correct).

As with syndicate bombs, a bomb with a toxin payload has a minimum 90
second timer, and will beep loudly to warn nearby crew to evacuate the
area.
It can be defused (or accidentally detonated early) in the same way a
syndicate bomb can.

This allows scientists a secure way to test their bombs (less chances of
accidental detonations with this method, although it adds extra steps),
and antagonists a way to craft their own syndicate bomb, which is better
than a simple tank transfer valve if your objective is not killing crew
but making sure a specific area is wiped off the station map with little
to no casualties.
 2018-11-06 20:01:19 +00:00
Ty-Omaha
eef502bebf spacing 2018-11-06 11:07:25 -05:00
alex-gh
4af7bf2710 Fixes exotic blood not working. 2018-11-06 13:17:30 +01:00
variableundefined
4a3658132c Merge pull request #10126 from Squirgenheimer/skipantagfix2 
moves Global Antag Candidacy var to client level, adds check to autotraitor and blob game modes
 2018-11-06 17:31:51 +08:00
R1f72r
986c2919b1 Added a space after my edit 2018-11-06 03:07:38 -05:00
R1f72r
d1e5a58769 Adds a death text to headslugs 2018-11-06 03:00:15 -05:00
Squirgenheimer
4b29a45263 autotraitor.dm: opted for continue statement in a couple of places, reworded a comment 2018-11-05 22:05:03 -05:00
Squirgenheimer
fcc86e1903 antag candidacy button can be clicked after join 2018-11-05 02:14:28 -05:00
Squirgenheimer
5d1ac25a64 moves skip_antag to client level, adds checks for it in autotraitor.dm and blob.dm 2018-11-05 02:02:40 -05:00
tigercat2000
1b4f7b1daf Merge pull request #10113 from farie82/Cling-stasis 
Cling regenerative stasis now appears as if the cling is dead on the med HUDs
 2018-11-04 10:57:11 -08:00
tigercat2000
32c5cb3bbe Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	icons/mob/screen_alert.dmi
 2018-11-04 10:52:50 -08:00
Citinited
5fb3fb71a1 oops 2018-11-04 18:31:48 +00:00
Citinited
da469031c9 Conveyors switch between speedy and normal process now 2018-11-04 18:19:51 +00:00
joep van der velden
5d357becfc Cling regenerative stasis now appears as if the cling is dead on the med HUDs 2018-11-04 17:16:31 +01:00
R1f72r
f27f51065e This should work 2018-11-04 11:15:57 -05:00
variableundefined
cf722492f7 Merge pull request #10105 from Agameofscones/ghost_spawn_fancysprites 
Ghost Roles Sprites (Affected is a nerd)
 2018-11-04 13:24:29 +08:00
Gwydion Brain
3aa11b1923 itsa me, the space-a bar 2018-11-03 20:57:09 -08:00
variableundefined
f2e5917edd Merge pull request #10097 from Agameofscones/Rsiks_Fluff_jacket 
Rsik's second fluff item
 2018-11-04 12:34:30 +08:00
variableundefined
b5728a6d74 Merge pull request #10095 from AffectedArc07/crisp-screen-mmmmmm 
Makes status display font crispy
 2018-11-04 12:30:34 +08:00
Gwydion Brain
b2a05de098 pulling a sneaky on Travis 2018-11-03 18:33:07 -08:00
variableundefined
81d4b71461 Merge pull request #10088 from TDSSS/kidan-name 
Make kidan names less shitty
 2018-11-04 10:17:50 +08:00
Gwydion Brain
aea775c651 Adds endline 
Maybe thats what borked it? Fuckin whitespace
 2018-11-03 18:01:13 -08:00
Gwydion Brain
ccfbe5f205 Shoes and Goo, hah get it? It's ointment 2018-11-03 17:05:25 -07:00
variableundefined
c2f92bec5e Make fermentation barrel a stack recipe, fixes koibean and soybean being OP 2018-11-03 21:39:38 +08:00