Commit Graph
26693 Commits
Author SHA1 Message Date
Birdtalon 550db12717 user feedback, updates adminhelp string, replying to a ticket stops stale counter 2017-10-01 23:18:51 +01:00
Birdtalon 6936306786 updates, removal of repeats 2017-10-01 16:05:56 +01:00
Birdtalon 98d9919712 styling and update 2017-10-01 15:37:38 +01:00
Birdtalon cd83385406 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ticket-machine 2017-10-01 13:57:40 +01:00
Birdtalon f926bfad2c Initial commit, adds admin ticket system framework, styles and hooks into adminhelp system. 2017-10-01 13:52:53 +01:00
tigercat2000 5a9c425932 Fix custom synthetic invisibility exploit
The proper way. This ensures that a given sprite actually exists before
offering you the option to use that sprite.
2017-09-30 15:24:56 -07:00
Fox McCloudandGitHub cb70e28e65 Merge pull request #8146 from Landerlow/Lesspain
Adds hydrocodone to medical borg hypospray
2017-09-30 03:52:33 -04:00
Jovaniph c428edf39e Merge Conflict thingy 2017-09-29 19:09:01 -04:00
Landerlow addbe41a5d Switch back from morphine to hydrocodone on maintainer recommendation 2017-09-30 01:08:32 +02:00
Fox McCloudandGitHub f1f245e3ae Merge pull request #8153 from imsxz/subtle-message-fix
Fixes immersion-breaking typo
2017-09-29 18:46:23 -04:00
Fox McCloudandGitHub cd99eb362e Merge pull request #7706 from Citinited/entertainment-monitor-fix
Camera console tweaks
2017-09-29 15:51:45 -04:00
Landerlow 7abe2a968d Changed reagent from hydrocodone to morphine 2017-09-29 12:10:36 +02:00
Fox McCloudandGitHub e8ab1697ad Merge pull request #8127 from uraniummeltdown/biodegrade
Changeling Biodegrade Power, Fixes Hivemind Link
2017-09-28 20:14:17 -04:00
Mars 2fae0f1739 isrobot check 2017-09-28 12:15:52 +02:00
uraniummeltdown 9d3bc5b400 forcemove 2017-09-28 13:36:54 +04:00
uraniummeltdown bbe4c341f8 Merge branch 'master' into biodegrade
# Conflicts:
#	paradise.dme
2017-09-28 13:35:30 +04:00
tigercat2000andGitHub 0e44384945 Merge pull request #7465 from Fox-McCloud/peacekeeper-borgs
Adds Peacekeeper borgs; Retains Secborgs
2017-09-27 17:23:16 -07:00
Fox-McCloud 9c3d0a9f8a bleh 2017-09-27 20:06:19 -04:00
Fox-McCloud e1ce6fac3b oops 2017-09-27 19:21:25 -04:00
Fox-McCloud 70d79e38f1 fixes 2017-09-27 16:01:48 -04:00
imsxzandGitHub cad084b8cb Fixes immersion-breaking typo 2017-09-27 14:54:56 -04:00
Fox McCloudandGitHub 327108805d Merge pull request #8137 from uraniummeltdown/ling
Some Ling Changes
2017-09-27 14:37:48 -04:00
tigercat2000andGitHub 00d79fd2de Merge pull request #8138 from uraniummeltdown/rpd
Adds the RPD to hacked Autolathes, Drones and Engineering Cyborgs
2017-09-27 11:03:54 -07:00
tigercat2000andGitHub 7c85d78050 Merge pull request #8151 from Birdtalon/emergency-crates
Crates will now forcemove mobs inside when opened
2017-09-27 10:38:47 -07:00
Fox McCloudandGitHub 83cc11f4a9 Merge pull request #8150 from imsxz/nukie-noslips-fix
Fix: Nukies can now purchase tactical no-slips
2017-09-27 13:23:01 -04:00
Birdtalon 9008505997 crates will now forcemove mobs inside when opened 2017-09-27 15:36:47 +01:00
imsxzandGitHub 7a4c66078e Allows nukies to purchase tactical no-slips 2017-09-27 10:08:03 -04:00
tigercat2000andGitHub fd29a8b160 Merge pull request #8143 from MarsM0nd/nukekeg
Makes the nuke beerkeg easily spawnable.
2017-09-26 20:56:34 -07:00
Mars 271b7cfb6c Whoops 2017-09-27 02:00:38 +02:00
Mars 08fe1a796f Nanotrasen, not Trasen 2017-09-27 01:48:08 +02:00
Landerlow c4243bb597 Adds hydrocodone to medical borg hypospray 2017-09-27 00:27:27 +02:00
Mars f1dc1e0fd8 Makes the nuke beerkeg it's own subtype. 2017-09-26 15:35:31 +02:00
uraniummeltdown 96c9e836c2 fleshmend restores 30 blood volume 2017-09-26 07:51:48 +04:00
uraniummeltdown ae3259020d added rpd to drones 2017-09-25 22:51:33 +04:00
uraniummeltdown fe9fba469b adds the RPD to autolathe and engiborgs, adjusted RPD materials to match the expensive autolathe price 2017-09-25 19:43:54 +04:00
uraniummeltdown 1503dee51e ling regen stasis time from 80s to 40s, armblade door open time from 15s to 10s, lings always keep regen stasis even when readapting, added mannitol and antihol to panacea, fleshmend chem cost from 25 to 20 and it no longer restores blood and spamming it in a short time gives less effective healing, spawn->addtimer in fakedeath.dm, lings can generate chems when dead up to half the max (37.5), added chameleon skin power for 2 evo points 2017-09-25 19:15:22 +04:00
tigercat2000andGitHub bf3f968c6f Merge pull request #7747 from SamHPurp/ouch-hot-hot-hot
Halts another macro suicide method
2017-09-24 18:48:52 -07:00
tigercat2000andGitHub 5ba25fab72 Merge pull request #8093 from Birdtalon/roboticists
Small robotics layout change.
2017-09-24 18:40:52 -07:00
tigercat2000andGitHub 855de4a7ca Merge pull request #8037 from Crazylemon64/cryopod_emag_objectives
Cryopods eject objective items upon emag
2017-09-24 18:32:49 -07:00
Fox McCloudandGitHub ebdc2846f6 Merge pull request #8050 from FlattestGuitar/more-fluff
Fei and Anxipal fluffs
2017-09-24 21:26:42 -04:00
Fox McCloudandGitHub eff00d67ad Merge pull request #8126 from imsxz/who-even-likes-superheros
Fixes bug with supervillain recruitment
2017-09-24 21:21:21 -04:00
Fox McCloudandGitHub 612fb1a78b Merge pull request #8117 from TDSSS/Immolator_fix
Gives immolator mech weapon unique ID, allows it to be constructed
2017-09-24 21:20:45 -04:00
Fox McCloudandGitHub c6f8907d96 Merge pull request #8125 from uraniummeltdown/bolatech
Lowers Mech Bola Launcher Combat Tech
2017-09-24 21:19:54 -04:00
tigercat2000andGitHub 4f452b2eae Merge pull request #8023 from Birdtalon/defibrilator-shortcut
Control Click shortcut for defibrillator toggle paddles verb
2017-09-24 13:16:50 -07:00
tigercat2000andGitHub e0f14cea84 Merge pull request #8132 from Xsingular/Tur
Fixed efficiency math in Turbine.dm
2017-09-24 13:15:09 -07:00
tigercat2000andGitHub c44f2ea807 Merge pull request #8134 from MarsM0nd/russiantypo
Fixes a typo with the russian revolver
2017-09-24 10:43:04 -07:00
Mars 6f736f4254 Wound, not would 2017-09-24 17:37:15 +02:00
XsingularandGitHub 88c6cb23ff Fixed efficiency math in Turbine.dm
Fixed the RPM equation in the Compressor part of Turbine.
2017-09-24 01:55:29 +02:00
uraniummeltdown caa41d5640 add changeling biodegrade power, move closet/crate/locker broken and locked vars up, re-add hivemind link to the dme 2017-09-23 19:04:22 +04:00
tigercat2000andGitHub a4d536bdaa Merge pull request #8111 from Varghh/Diona
Diona changes (New language color, emote, speech sound)
2017-09-22 15:16:12 -07:00