cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
4623 Commits
Author SHA1 Message Date
Mloc-Argent 9d2e107005 Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-25 18:30:24 +01:00
Mloc-Argent 8575b7a286 And once again, did that the wrong way around. Whoops. 
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:41:50 +01:00
Mloc-Argent adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
LordBraindead 53c73f6b85 Update power_cells.dm 
derped a debug message into the commit
 2013-07-14 21:22:09 +02:00
LordBraindead 08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
comma 1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
Zuhayr 1750f1e631 Merge pull request #3244 from Ispil/Staging 
Fixes issue #3240. The order for visible_message is visible, person, aud...
 2013-07-04 23:09:44 -07:00
Ispil 255408c026 Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed. 2013-07-04 21:13:33 -07:00
Spamcat 11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops 
Conflicts:
	code/game/gamemodes/objective.dm
 2013-07-01 19:49:29 +04:00
comma 50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
Zuhayr 3fb62273f7 Custom item. 2013-07-01 19:21:49 -07:00
Zuhayr c7bbc3c9b3 Changelog. 2013-06-28 15:53:50 -07:00
Segrain 31e4487229 Fix for #2430. 2013-06-27 14:10:05 +03:00
Spamcat 2624abdaba Secbelts now can hold melee weapons. 2013-06-19 15:08:55 +04:00
Zuhayr 63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Chinsky cb7daa77a6 Merge branch 'bleeding-edge-freeze' into viro 2013-06-18 14:55:59 +04:00
Chinsky ca4c3869b9 Merge branch 'bleeding-edge-freeze' into vials 2013-06-16 11:20:45 +04:00
Chinsky f052d8d972 Added boxes for vials. Usual and secure version(default to viro access) 
Changed vial lid sprite slightly.
 2013-06-16 11:20:32 +04:00
Zuhayr b1cac56e9a Merge resolution. 2013-06-15 03:54:22 -07:00
Jamini 89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
Zuhayr 6b73b8ec2f Adjusted kitchen knives. Added projectile pinning. Various tweaks. 2013-06-13 20:46:09 -07:00
Zuhayr 7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Zuhayr 0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07:00
Zuhayr d0e15b3608 Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi. 2013-06-11 13:15:33 -07:00
Furlucis 360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
Zuhayr bc2db268cc Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning. 2013-06-10 17:16:54 -07:00
Chinsky e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 05:55:42 +04:00
Zuhayr df75d25cb3 Map conflict, using BEF. 2013-06-06 10:40:22 +09:30
Chinsky 57c1ebb285 Merge pull request #2977 from MagmaRam/master 
Fix for security belts not holding all seven items sometimes
 2013-06-05 06:21:47 -07:00
MagmaRam ae697179c9 Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them. 2013-06-05 20:14:11 +07:00
MisterBook 606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Furlucis 24098c6529 UNadded robotic hands and feet because there was no point in doing this in the first place. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 22:32:39 -04:00
Furlucis e32b253a41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-31 20:01:57 -04:00
MisterBook 06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
Segrain 3409e1f05d Toolbelts can hold engineering tape. 2013-05-30 19:35:03 +03:00
Segrain 50f05f7a11 Pill bottles can hold paper. 
For prescriptions and such.
 2013-05-30 19:28:34 +03:00
Furlucis 08524aa4d2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-27 01:48:44 -04:00
cib cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
meyar c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-24 05:23:36 -04:00
Kilakk ef2c7af6a0 Telescopic baton message fix. 
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
 2013-05-23 16:24:53 -04:00
meyar ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now) 
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
 2013-05-19 05:00:06 -04:00
meyar c170f57ba7 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. 2013-05-18 06:48:01 -04:00
Mloc-Argent 27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Spamcat 0acd40326f Increased pill bottle capacity to 14 pills (2 rows). 
Also fixed #2714.
 2013-04-30 15:44:31 +04:00
NerdyBoy1104 390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Furlucis 17860ff33a Added robotic hands and feet. 
Apply screwdriver to robotic arms and legs to get hands/feet. They can
be surgically attached properly, far as I can tell. Also, fixed a few
backwards slashes in text marcos.
 2013-04-19 00:41:45 -04:00
SkyMarshal f05b8e0083 Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-18 09:56:49 -07:00
Spamcat e40ff1bfc4 No need for dis shit. 2013-04-17 14:21:44 +04:00
Spamcat 44401cf03e Fixed blood overlays for batons. Also,changelog. 2013-04-15 22:23:09 +04:00