cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,204 Commits 15 Branches 2 Tags
87ff44acb68dee1455b143d4b01190ac4f1a6a3c
Commit Graph
17587 Commits
Author SHA1 Message Date
Fox McCloud 87ff44acb6 Merge remote-tracking branch 'upstream/master' into purges-assisted-organs 2018-07-09 01:26:42 -04:00
Fox McCloud 3a230faaa6 grammar tweak 2018-07-08 20:03:00 -04:00
Fox McCloud 27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
Fox McCloud 62f39784e2 Cybernetic Organs 2018-07-07 19:48:04 -04:00
tigercat2000andGitHub 8153313aa3 Merge pull request #9130 from Kyep/chatroom_be_gone 
Removes PDA Chatrooms
 2018-07-06 18:29:56 -07:00
Crazy LemonandGitHub 2a0733a008 Merge pull request #9151 from Fox-McCloud/pistol-change-loot 
Stechkin Maintenance Pistol Change
 2018-07-06 18:12:29 -07:00
tigercat2000andGitHub fcdb0fe54b Merge pull request #9172 from Fox-McCloud/no-lances 
Removes Explosive Lances
 2018-07-06 15:01:07 -07:00
Fox McCloud 319a6cd500 Removes Explosive Lances 2018-07-03 18:13:51 -04:00
Crazy LemonandGitHub fc60131d5d Merge pull request #9166 from alexkar598/this-will-burn-ais-down-to-the-ground 
Ais can no longer be on fire
 2018-07-03 12:47:38 -07:00
Crazy LemonandGitHub bd7540a3f9 Merge pull request #9159 from MINIMAN10000/pod-eject 
Restrained spacepod passenger can now exit pod after 2 minutes
 2018-07-03 12:05:04 -07:00
alexkar598andGitHub c391e4d823 you want those true and false? 2018-07-02 15:37:14 -04:00
alexkar598andGitHub 7fafde8102 Update ai.dm 2018-07-02 15:32:41 -04:00
alexkar598andGitHub dc47c9d62b IT burnnnns 2018-07-02 14:40:03 -04:00
MINIMAN10000 17a4d52101 not do_after, not equal concious, warn pilot if there is one 2018-07-02 11:09:35 -07:00
MINIMAN10000 288c16df1b Restrained spacepod passanger can now exit pod after 2 minutes 2018-07-02 00:38:06 -07:00
Fox McCloudandGitHub 9eefe326c8 Merge pull request #9140 from Crazylemon64/mmi_radio_upgrade 
MMI radio upgrade
 2018-07-01 22:19:18 -04:00
tigercat2000andGitHub 76aefc59df Merge pull request #8963 from FalseIncarnate/fluff 
E.L.O. Fluff 2
 2018-07-01 15:04:39 -07:00
Crazy LemonandGitHub 3ca333d666 Merge pull request #9040 from Anasari/CryoLog 
Cryo Logging PR
 2018-07-01 00:47:39 -07:00
FalseIncarnate 5823b354df merge conflicts 2018-07-01 02:42:31 -04:00
Crazy LemonandGitHub 3975a7d0f7 Merge pull request #8999 from Citinited/somebody-toucha-ma-spaghett 
Adds macaroni cheese (pizza)
 2018-06-30 22:11:05 -07:00
Crazy LemonandGitHub bdaa1813a2 Merge pull request #9149 from datlo/master 
Clown Magboots
 2018-06-30 22:08:29 -07:00
Crazy LemonandGitHub f1fc9375f5 Merge branch 'master' into LabelerLogging 2018-06-30 20:19:53 -07:00
Fox McCloud 6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
Crazy LemonandGitHub 7d61c7f32d Merge pull request #9047 from Citinited/conveyor-belt-placer 
Adds the conveyor belt placer
 2018-06-29 21:11:49 -07:00
datlo 69779717fa Cut code duplication, added sprites 
Added a new variable to magboots called slowdown_passive, letting you
set how much the magboots slow you down when not activated, by default
SHOES_SLOWDOWN (same behaviour as before). Clown magboots use
SHOES_SLOWDOWN+1, same speed as clown shoes.

Removed redefinition of toggle as the magboots can now use the original
toggle properly.

Removed var/footstep which was copy pasted from the original clown
shoes, as far as I can tell it is not used or checked anywhere and
removing it does not silence squeeks or change any other behaviour.

Added sprites for the item icon and the mob's shoes when activated and
deactivated (adds a little red light that can be seen by a keen eye when
the shoes are activated)
 2018-06-29 20:22:22 +02:00
datlo 8a909e4da5 Clown Magboots V2 
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
 2018-06-28 12:10:22 +02:00
datlo 0100f679b0 Revert "Clown Magboots V1" 
This reverts commit 38d0c3652c.
 2018-06-28 12:03:11 +02:00
datlo 38d0c3652c Clown Magboots V1 
Item created, added to uplink
 2018-06-27 23:39:17 +02:00
Fox McCloudandGitHub bfac50ef12 Merge pull request #9114 from MINIMAN10000/Fix-Emitters 
Fix emitters
 2018-06-26 22:29:55 -04:00
Citinited e73ce56370 crazylemon tweaks 2018-06-26 22:18:27 +01:00
Anasari 5a09245029 Change to attack logs. Use ATKLOG_ALL 2018-06-26 16:47:09 +08:00
Anasari 6c8bba3f63 Merge branch 'master' into CryoLog 2018-06-26 16:24:29 +08:00
Crazylemon64 be4a1e426d Adds a radio MMI upgrade module, printable in the mech fab 
Can be uninstalled with a screwdriver
 2018-06-24 13:32:36 -07:00
Crazylemon64 4fec0d6b0a Small refactor of posibrain to keep things clean 2018-06-24 09:45:35 -07:00
tigercat2000andGitHub 27841fdd5a Merge pull request #8895 from matt81093/death_squid 
Death Squid hitbox adjustment
 2018-06-22 00:09:02 -07:00
tigercat2000andGitHub e82b2484e4 Merge pull request #9129 from Fox-McCloud/honkkkkkkk 
Customize Honk Sound for Clown Uniform
 2018-06-22 00:00:24 -07:00
Kyep de0ceaf769 Deletes chatrooms 2018-06-20 18:24:59 -07:00
Fox McCloud 6376f62959 Customize Honk Sound for Clown Uniform 2018-06-19 23:46:57 -04:00
MINIMAN10000 06cfcd156d Better method of deffered processing 2018-06-18 12:10:16 -07:00
Shanewayne9andGitHub b6c5c9d3cf coin string fix 
from #9106
 2018-06-17 18:14:52 -07:00
tigercat2000andGitHub 78b2aa7288 Merge pull request #9116 from Kyep/login_runtime_fix 
Fixes can_vote runtime
 2018-06-14 12:14:55 -07:00
tigercat2000andGitHub 87fa3e2dbe Merge pull request #9117 from variableundefined/voxswatfix 
Make it so that vox can wear SWAT suit
 2018-06-14 12:13:43 -07:00
variableundefined f92f30de96 Make it so that vox can wear SWAT suit 2018-06-14 21:52:05 +08:00
Kyep b65c84cd13 fixes can_vote runtime 2018-06-14 03:05:13 -07:00
MINIMAN10000 8bbce44c49 Fix emitters 2018-06-13 22:40:38 -07:00
shazbot194 731c1c72b4 Conflict Fix and update to sprite 2018-06-13 19:25:11 -08:00
shazbot194 bf43e13056 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Vox_suits 2018-06-13 19:09:32 -08:00
tigercat2000andGitHub f31d79a961 Merge pull request #9064 from Anasari/MoreClickAntag 
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
 2018-06-13 18:43:18 -07:00
Kyepandtigercat2000 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992) 
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
 2018-06-13 16:55:21 -07:00
tigercat2000andGitHub 07d585929f Merge pull request #8969 from Fox-McCloud/surgery-set 
Updates Surgery Augment: Adds it to R&D
 2018-06-13 16:24:53 -07:00