cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,822 Commits 29 Branches 2 Tags
32c5cb3bbe2afe5c8d888ed832dbc64441bafff2
Commit Graph

29987 Commits

Author SHA1 Message Date
tigercat2000
32c5cb3bbe Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	icons/mob/screen_alert.dmi
 2018-11-04 10:52:50 -08: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
variableundefined
97fa69b02d Merge pull request #9986 from Dave-TH/access_tuner 
Access Tuner
 2018-11-04 12:27:16 +08:00
variableundefined
bc4b37dcca Merge pull request #10101 from Citinited/normal-processing-fix 
Calling makeNormalProcess on a speedy machine no longer breaks it
 2018-11-04 12:24:49 +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
TDSSS
ce3cd42d75 consistent spacing 2018-11-04 00:54:33 +01:00
Citinited
4eca9c92b8 Calling makeNormalProcess on a speedy machine no longer breaks it 2018-11-03 15:50:01 +00:00
variableundefined
ca43b7f29a Merge pull request #10031 from Certhic/nymphs-gui 
diona nymphs fixes and hud
 2018-11-03 18:20:47 +08:00
Certhic
6381d15525 action buttons 2018-11-03 10:57:19 +01:00
variableundefined
e03d3e4770 Merge pull request #10090 from farie82/Security-logs-fix 
Initializes the security comments on creation of the records + made a set criminal status helper
 2018-11-03 13:32:57 +08:00
variableundefined
d45e3e1574 Merge pull request #10069 from Jazz23/master 
Perma Teleporter method of uploading coordinates
 2018-11-03 08:31:50 +08:00
Gwydion Brain
1f6613c289 Initial 2018-11-02 13:31:25 -07:00
Fox McCloud
ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
AffectedArc07
e6296d3505 mmmmmmmmmm crispy 2018-11-02 19:44:23 +00:00
tigercat2000
eea5233d82 Convert phazon damtype to action button (missed thsi whoopsies) 2018-11-02 01:07:50 -07:00
tigercat2000
b370858fc8 Fixes Phazon movespeed, add radial menus to ctrl 
Ctrl Clicking on a mech while you're in it will now bring up a radial
weapon selection
 2018-11-02 00:46:08 -07:00
farie82
ef67742141 Update mobs.dm 2018-11-02 08:02:22 +01:00
tigercat2000
f619a49ac6 Merge pull request #10082 from variableundefined/GlovesLog 
Add attack log to stun gloves
 2018-11-01 22:44:21 -07:00
variableundefined
a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns 
Adds Space Ruins / Ghost Roles
 2018-11-02 08:12:01 +08:00
joep van der velden
7a95a919be Added the requests 2018-11-01 22:43:19 +01:00
tigercat2000
d6a852bcfa Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	code/game/mecha/mecha.dm
 2018-11-01 08:37:46 -07:00
variableundefined
acb594f965 Merge pull request #10051 from farie82/Mech-repair 
Mechs now can't be spam repaired
 2018-11-01 22:55:38 +08:00
joep van der velden
b553c3548a Fixed it + made a helper 2018-11-01 14:59:41 +01:00
TDSSS
d171e71fea miner -> prospector 2018-11-01 13:40:41 +01:00
TDSSS
cb2a46ae97 More castes, weeee 2018-11-01 11:28:01 +01:00
TDSSS
f2aced6c78 More castes 2018-11-01 11:14:47 +01:00
TDSSS
b56af0a3a8 Make kidan names less shitty 2018-11-01 10:39:55 +01:00
variableundefined
aaffaedb37 Merge pull request #10057 from warior4356/drone-death 
Solves ghosts re-entering shutdown drones by making the ghost unable to reenter corpses
 2018-11-01 16:16:48 +08:00
variableundefined
3cc5e7bcd8 Merge pull request #10085 from Mitchs98/headslugfix 
Changelings can no longer escape lockers VIA Headslug
 2018-11-01 14:38:44 +08:00
Mitchell
91fb53351f Removes user.loc 2018-11-01 01:25:17 -05:00
Mitchell
5a9a966f03 Fixes #10083 2018-11-01 00:04:01 -05:00
variableundefined
e2b9a51085 Merge pull request #10084 from Mitchs98/poolspamfix 
Reduces Pool Temp Spam
 2018-11-01 10:15:02 +08:00
Mitchell
c973807251 Reduces Pool Temp Spam 2018-10-31 21:00:42 -05:00
variableundefined
05b8b3fa91 Merge pull request #10071 from shazbot194/illegal_borg_desc 
Updates desciption on illegal borg upgrades
 2018-11-01 09:14:56 +08:00
variableundefined
cea8b8294d Add attack log to stun gloves 2018-11-01 07:24:22 +08:00
variableundefined
401f639870 Merge pull request #10079 from Citinited/aaaaa 
Kills another disposals nullspace bug
 2018-11-01 07:15:35 +08:00
Citinited
1af2c7cb14 kills another nullspace bug 2018-10-31 22:08:54 +00:00
Certhic
2c0def4a82 button-iy 2018-10-31 20:01:45 +01:00
joep van der velden
65675b6c8b spacing! 2018-10-31 19:23:16 +01:00
joep van der velden
f9a9b09616 Put in tigers code 2018-10-31 19:20:48 +01:00
Arkatos1
9aed1d6697 Fixes Rewriter drink description typo 2018-10-31 14:23:04 +01:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
shazbot194
5d43617825 Shadey's nitpick 2018-10-30 20:24:12 -08:00
shazbot194
ff961c609f Updated 2018-10-30 19:44:32 -08:00