cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,159 Commits 5 Branches 0 Tags
81a9f87ad7ce26ffbee14f1ac893611c94734f85
Commit Graph

356 Commits

Author SHA1 Message Date
Chinsky
81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire 
Implements liquid fuel fires
 2015-03-03 10:31:49 +03:00
mwerezak
49b3db964f Implements fuel fires 
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
 2015-03-02 12:40:01 -05:00
PsiOmega
98be5cbce8 Synth medical sensors now report dead/alive status. 
Synths with medical augmentation sensors enabled will now see the dead/alive status of crew members with suit sensors set to at least binary level.
 2015-03-02 13:04:02 +01:00
Zuhayr
1f448a40d1 Giving the assistant macro a more descriptive name. 2015-02-28 20:28:51 +10:30
Zuhayr
64b33c43db Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment. 2015-02-28 20:20:19 +10:30
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
 2015-02-27 09:06:48 +01:00
GinjaNinja32
e47c45591c Fixes a few issues with noise-language. 2015-02-23 18:58:41 +00:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
mwerezak
f8977c65af Much nicer syringe gun implementation 
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
 2015-02-13 23:48:35 -05:00
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
 2015-02-13 01:57:19 -05:00
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
 2015-02-10 20:59:22 -05:00
mwerezak
bf24ac82b8 Removes IsHandgun() proc, adds slot flag 2015-02-10 20:25:41 -05:00
PsiOmega
02dc9e3008 Lightly boosts the clerical kit. 
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
 2015-02-10 20:12:32 +01:00
PsiOmega
e1e5d993dd Minor cleanup in setup.dm 
Fixes #8074.
 2015-02-09 08:27:38 +01:00
Zuhayr
402987edc3 Merge with dev. 2015-02-07 14:44:55 +10:30
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano 
NanoUI/Topic make-over
 2015-02-06 00:15:04 +03:00
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano 
Conflicts:
	code/setup.dm
 2015-02-05 12:37:15 +01:00
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr
d08861e25b Moved gas/light/pressure from hydro tray to seed datum 2015-02-04 10:46:10 +10:30
PsiOmega
0ec47b225f Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/setup.dm
 2015-02-04 00:00:17 +01:00
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
 2015-02-04 04:44:09 +06:00
PsiOmega
a7a33e0a35 Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-02-03 22:28:53 +01:00
PsiOmega
21a0aa05e5 Topic now uses the NanoUI can_interact_with_interface() proc to determine functionality. 
can_interact_with_interface() has been updated with the old canUseTopic() checks.
 2015-02-03 20:24:11 +01:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 18:30:18 +03:00
Chinsky
c3559556a0 Merge pull request #8027 from Baystation12/dev-freeze 
Wiz freeze
 2015-02-03 18:23:18 +03:00
Chinsky
7ef4192950 Merge pull request #7941 from mwerezak/radiator 
Expands on SkyMarshal's radiation changes
 2015-02-03 18:14:56 +03:00
Chinsky
28ee1be312 Merge pull request #7952 from PsiOmegaDelta/AIEye 
Observers can now see the AI eye
 2015-02-03 18:14:08 +03:00
mwerezak
1f869ebe1a Mob fire adjustments 
Temperature increase caused by being on fire is now affected by
get_heat_protection().
If a mob is on fire but it's fire_stack <= 0 then it gets extinguished,
just in case.
 2015-02-01 12:11:43 -05:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
PsiOmega
fb84e5f50a Ghosts now have more sight options. 
Can now toggle between the following modes:
* See other observers + AI eye + darkness
* See only darkness
* No darkness
 2015-01-29 09:11:39 +01:00
PsiOmega
f6b3bfce1c The AI eye now has a sprite. 
Also defines new (see_)invisibility levels for the AI eye, to ensure that cultists visiting the other side cannot suddenly see it while still allowing observers to.
Uses a black and white version of the face hologram as placeholder.
 2015-01-26 22:28:13 +01:00
mwerezak
73b6150d55 Fixes radiator exposed surface value 
Fixed the RADIATOR_EXPOSED_SURFACE_AREA_RATIO constant. The existing
value of 3 cm was bad the value needs to be unitless. Also replaced the
RADIATOR_OPTIMUM_PRESSURE placeholder with something that has a bit more
substance.
 2015-01-26 11:45:53 -05:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
PsiOmega
9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-01-21 08:53:27 +01:00
Mloc
b1ba9a6d0e Merge pull request #7813 from SkyMarshal/patch-1 
Adjusts HE pipe properties
 2015-01-20 11:24:03 +00:00
Zulker Nayeen Nahiyan
6f9ecab50c Cleanup according to critique, remove else returns, fix comments 
`type2type.dm`
	Remove no-op `else return`s at the end of a switch and function.

`setup.dm`:
	Remove outdated comment "Must be between 0 and 1.", as noted by mwerezak.
	Fix typo in comment "FOOR_RIGHT" to "FOOT_RIGHT"
 2015-01-19 04:25:25 +06:00
SkyMarshal
1b3246c196 Adds a constant for the surface area of a HE pipe exposed to sunlight. 2015-01-13 15:22:55 -07:00
Zulker Nayeen Nahiyan
ab9210a1f9 Fix compile errors, rename mathematical constants to M_PI etc. 
`setup.dm`:
	Renamed `PI`, `E` and `Sqrt2` macros to `M_PI`, `M_E` and `M_SQRT2`

Others:
	Changed the macro usage accordingly: `PI` -> `M_PI`
 2015-01-10 03:47:11 +06:00
Zulker Nayeen Nahiyan
203a7f1092 Fix compile error, remove Pi etc. from maths.dm and re-add them in setup.dm, fix bittest macros formatting to allow searching 
`maths.dm`:
	Removed `var/const`s `E`, `Pi`, `Sqrt2`.

`setup.dm`:
	Re-added `PI` here, and added `Sqrt2`, `E` as macros.
	  The reason for this is that macros have a performance improvement over `var/const`s.

`lists.dm`
	Changed the formatting of the `BITTEST(...)` etc. macros so that they can be found by
	  searching for `#define BITTEST`

`rig.dm`:
	Fixed unknown variable error resulting from the usage if `STOPSPRESSUREDMAGE`
	  which was renamed to `STOPPRESSUREDAMAGE` in one of my earlier commits.

Others:
	Replaced constant variable `Pi` usage, with macro `PI`.
 2015-01-10 03:14:48 +06:00
Zulker Nayeen Nahiyan
b6ab0b64c0 Cleanup global.dm and setup.dm, fix typos in the other files 
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
 2015-01-10 02:01:55 +06:00
mwerezak
d240f6563d Throwing speed defines 2014-12-31 02:02:49 -05:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Mloc-Argent
debba68c44 add sleeping for ZAS connection edges 
Edges will sleep and fully balance if compare() passes.
also some small small xgm tweaks.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-21 20:35:40 +00:00
GinjaNinja32
681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! 
Conflicts:
	code/modules/mob/hear_say.dm
 2014-12-08 15:32:49 +00:00