cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,064 Commits 8 Branches 0 Tags
f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Commit Graph

194 Commits

Author SHA1 Message Date
Zuhayr
c0b91504b4 Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR. 2014-01-28 15:59:50 +10:30
Chinsky
669ae9a1ae Made cables use color var instead of separate icons for each color. 
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
 2014-01-19 03:02:58 +04:00
Zuhayr
22e325d6ec Implemented IS_SLOW. 2014-01-06 00:13:49 +10:30
Zuhayr
2a2fffc616 Fixed a duplicate definition bug with WHITELISTED. 2014-01-05 23:36:16 +10:30
Zuhayr
b0aeb89bd1 Reusing some unused flags in species. 2014-01-05 13:44:17 +10:30
Fira
de7c480439 Added GhostRadio -- Allowing ghosts to spy on radio from anywhere 2014-01-04 12:25:09 +01:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
jack-fractal
cf5012ce1d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-17 16:30:42 -05:00
Nanai
a104453156 Added and Adjusted Chemicals 
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.
 2013-11-14 13:08:30 -05:00
jack-fractal
6764c54989 making a generic version of the AI's visibility code so that it can be reused by the Cult Spirits 2013-10-26 16:52:14 -04:00
Chinsky
29ea7f0d3a Merge branch 'dev-freeze' into dev 
Conflicts:
	html/changelog.html
	maps/tgstation2.dmm
 2013-10-10 14:37:41 +04:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Chinsky
7555dd0f0b Merge branch 'master' into dev 
Conflicts:
	code/setup.dm
 2013-10-08 15:16:57 +04:00
Mloc-Argent
ebf2ba2d4a Fixes. 
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:35:26 +01:00
Mloc-Argent
8b2c3fc153 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
Chinsky
732596805a Merge pull request #3734 from Baystation12/master 
Master -> dev
 2013-10-06 11:39:36 -07:00
SkyMarshal
8111178b6e Updates the zone-sleeping code to account for turf changes. 2013-10-05 12:38:33 -07:00
SkyMarshal
cffa100caa Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:32:02 -07:00
SkyMarshal
eeb25f7b89 Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:29:25 -07:00
Erthilo
c872099e11 Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent. 2013-09-01 21:23:37 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Zuhayr
64e705ba33 Adding radiation feeding to dionaea, tweaking species values, adding shock to lighting checks, adding light checks to diona nymphs. 2013-08-25 02:08:09 -07:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Zuhayr
6e81952c20 Moved language flag defines to setup.dm. 2013-08-10 21:00:32 -07:00
Zuhayr
e9a1272d34 Moved species defines to setup.dm, add whitelisted species global. 2013-08-07 01:12:11 -07:00
Zuhayr
e16d06d469 Merged setup.dm. 2013-07-28 08:46:10 -07:00
Zuhayr
0c88896adf Adds a vox heist game mode. Fairly complex. 2013-07-28 05:18:04 -07:00
Segrain
47db87fcfe Cameras for strike teams. 2013-07-28 01:59:03 +03:00
Segrain
914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Zuhayr
b0d8ee7861 Merge resolution. 2013-07-26 23:17:48 -07:00
Segrain
fe0e1ecfb6 Conflict fix? 2013-07-25 09:55:35 +03:00
Segrain
a17e456a97 Defaulting LOOC to being toggled on. 2013-07-25 03:04:28 +03:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
comma
f1cfb96dab Fixes #3225. Adds separate toggle for LOOC. 
Fixes #3285. Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
 2013-07-10 22:39:27 +04:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Spamcat
6e61fe3914 Initial pulse code. WIP 2013-07-05 03:11:50 +04:00
Zuhayr
513a9d7ee8 Fixes #3052 2013-06-22 20:22:19 -07:00
MisterBook
a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
MisterBook
fd8d61aa8b New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations. 
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.

HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.

Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.

Icon adjustments.
 2013-06-04 22:41:23 -05:00
Aranclanos
787565b424 SecHUDs and medHUDs (including pAIs and odyssesus) won't create a fuckload of images per tick and then disposal them, lagging like retards. 
Now each human will have a list of HUD images, that will be refreshed if it's required, say, a medic walking near you with a medHUD will refresh both medical images.
The list, called hud_list, uses seven defines for all the images, defined in the __DEFINES.dm

I also added a check for not rounding the health bar if the pacient it's dead, fixing some issues with showing dead people in critical or with possitive health.
 2013-06-04 14:00:40 +04:00
MisterBook
25d5600d19 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

Attempting to merge with BEF
 2013-05-31 00:21:48 -05:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
Chinsky
c78f47c795 Merge branch 'bleeding-edge-freeze' into tentacles 2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
Erthilo
0e3bf2f371 Fixes UI being reset randomly on irradiating in Genetic Scanners. 2013-05-25 22:10:14 +01:00
Chinsky
665aaea722 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles 2013-05-24 00:43:33 +04:00
Chinsky
7806915619 Added organ mutations. 
Only have sprites for humans yet.
Added is_usable() proc that checks for both limb missing or being a tentacle
 2013-05-19 17:56:29 +04:00