cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,201 Commits 10 Branches 0 Tags
1c3eb1f364981ddfb73f1719ea41fc8f005da89c
Commit Graph

16836 Commits

Author SHA1 Message Date
Anewbe
1c3eb1f364 Merge pull request #4715 from VOREStation/arosorta-maploader 
Tweak map-loading in some ways
 2018-02-04 22:30:03 -06:00
Anewbe
9360a1c0f7 Merge pull request #4717 from VOREStation/aro-idlekick 
Improve admin idlekick capability/awareness
 2018-02-04 22:26:35 -06:00
Anewbe
90f7781e40 Merge pull request #4711 from VOREStation/aro-shuttledash 
Add shuttle door/environment sensors
 2018-02-04 22:24:47 -06:00
mistyLuminescence
da4bd82a5d Adds more med gear to R&D and Cargo (#4691) 
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
 2018-02-04 22:18:36 -06:00
elgeonmb
00ed88764f 2/3/18 news update (#4713) 
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster

* news update
 2018-02-04 18:15:42 -06:00
Anewbe
02f040ecef Merge pull request #4719 from Cyantime/desafe 
Makes containment fields and tesla bolts bypass gloves
 2018-02-04 18:14:06 -06:00
Andromeda-K22
cee3066a41 RUST additions and updates, Modular guns, and Lead. (#4667) 
* expanding rupture procs
adds hydromagnetic traps for power production.

* Minor tweaks.

* Adds modular guns using research components.

* Updates materials to have a radiation_resistance variable, used in calculating radiation. Adds Lead as a material.

* Un-zeros stock material radiation resistance.

* Adds, and enables four 'end-events' for the RUST in place of the old Rupture() proc.

* Map muckery?

* absolute pathing i guess?

* getting angry, travis.

* TRAVIS
STAHP

* I...
Comments? Lists? Who the hell knows.
 2018-02-04 18:04:28 -06:00
Cyantime
2cf7149607 Makes containment fields and tesla bolts bypass gloves 2018-02-04 02:22:35 -05:00
Arokha Sieyes
13bfcf6bd3 Improve admin idlekick capability/awareness 2018-02-04 01:05:03 -05:00
Cameron653
9e52040d5a Loadout Text-To-Speech device. (#4697) 
* TTS Device

* Makes it a proper /device

* boop

* to_chat and message change
 2018-02-03 22:47:01 -06:00
Cameron653
1999fc2a2a Changes 'undislocate' to 'relocate' (#4650) 
* Chaning undislocate to relocate.

Have to use web browser for this one at the moment.

* Changes undislocate -> relocate

* Last file to change to relocate

* Changes it to the best medical term for the action.

* Reduce -> Relocate
 2018-02-03 22:45:50 -06:00
Arokha Sieyes
9d0ffb96ee POLARIS: Tweak map-loading in some ways 
Fixes loading of map templates, now loads it acutally in the center instead of to the upper-left of center.
Warns you if you try to load a submap which is larger than the current world size.
 2018-02-03 22:30:24 -05:00
Arokha Sieyes
d71a2be346 POLARIS: Add shuttle door/environment sensors 2018-02-03 20:57:49 -05:00
Anewbe
6f8d35a2b3 Merge pull request #4708 from Cameron653/patch-6 
Moves var/get_rig_stats to the correct file.
 2018-02-03 19:51:37 -06:00
Anewbe
3492659b24 Merge pull request #4709 from Cameron653/patch-7 
Fixes Rainbow Slime Cores Having Infinite Uses
 2018-02-03 19:51:12 -06:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681) 
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
 2018-02-03 14:40:09 -06:00
Cameron653
ace6e8f069 Fixes #4596 
As much as I hate to see it go, it is a bug, after all.
 2018-02-03 14:31:38 -05:00
Cameron653
e7d5402efb Update computer.dm 2018-02-03 14:18:25 -05:00
Cameron653
d938963131 Moves var/get_rig_stats to a proper area. 2018-02-03 14:17:49 -05:00
Neerti
a493a379fe Merge pull request #4661 from VOREStation/vplk-ss-zas-airflow 
Convert ZAS into StonedMC Subsystems
 2018-02-01 21:08:41 -05:00
Anewbe
4b4e3bb6f1 Merge pull request #4672 from elgeonmb/patch-1 
humans can be older
 2018-02-01 15:21:36 -06:00
Leshana
5a2162a264 Preliminary implementation of ZAS as a StonedMC subsystem. 
* Creates the SSair subsystem which replaces the Setup, Start(), and Tick() procs of air_master.
* It may be best to have SSair completely replace air_master, but for now we are having them work together.   It does completely replace the old processScheduer air ticker however.
* Remove the obsolete Setup and Tick procs.
* Adjust admin and debug verbs that dealt with some ZAS internals to work with the new implementation.
 2018-01-30 12:28:45 -05:00
SunnyDaise
d508af3285 Fixes: 
Onion Rings are no longer named Onion Soup
 2018-01-30 16:02:13 +00:00
Neerti
f4c459624e Merge pull request #4657 from VOREStation/aro-jobsort 
Sort jobs into correct departments, cargo color
 2018-01-30 09:48:23 -05:00
Neerti
fd6d378e09 Merge pull request #4655 from VOREStation/aro-connector 
Shuttle connector for lateloaded maps
 2018-01-30 05:40:16 -05:00
Anewbe
9586d84dc1 Merge pull request #4674 from Cyantime/potatotwo 
Makes potatos cuttable into sticks again
 2018-01-30 03:17:53 -06:00
Cyantime
9aab3ba08c Makes R-UST machines deconstructable, some more fixes (#4634) 
* More R-UST things

* These too
 2018-01-30 03:16:16 -06:00
Anewbe
e6f57b15b4 Merge pull request #4627 from VOREStation/pol-dark-eyeglow 
Species var that enables eyes to glow
 2018-01-30 03:14:56 -06:00
Neerti
6226d3d15c POI Tweaks (#4645) 
* WOrk

* Changes more PoI stuff.
 2018-01-29 23:42:57 -06:00
Neerti
e054b32143 Merge pull request #4675 from Cyantime/PAsprite 
Adds level 3 particle accelerator sprites
 2018-01-30 00:31:59 -05:00
Anewbe
3440b3ef22 Merge pull request #4671 from Cyantime/patch-2 
Removes sleep from fusion fuel injection
 2018-01-29 14:13:30 -06:00
Aronai Sieyes
47758a0453 POLARIS: Allow admins to see say/emote near their own body while they are aghosted. (#4663) 2018-01-29 11:47:08 -08:00
Cyantime
5b358cb7c5 PA sprites 2018-01-29 00:33:09 -05:00
Neerti
793600a77a Merge pull request #4652 from VOREStation/aro-givefix 
Fixes #4643
 2018-01-29 00:31:52 -05:00
Cyantime
154eea2a95 Fixes potato sticks 2018-01-28 23:41:00 -05:00
Mechoid
e9886625fa Adds Material Girders (#4622) 2018-01-28 18:13:54 -08:00
Cyantime
173a196212 Removes duplicate rezadone definition (#4660) 2018-01-28 18:12:32 -08:00
Aronai Sieyes
8053d47bfa Adds a 'Save PNG' verb for fun (#4658) 2018-01-28 18:11:49 -08:00
Aronai Sieyes
e69af92218 Move these defines into proper files (#4653) 2018-01-28 18:09:35 -08:00
Aronai Sieyes
1ec3d4b598 Fixes #4633 (#4651) 2018-01-28 18:07:28 -08:00
MarinaGryphon
4ea7823db2 Fixes incorrect gib animations. (#4646) 2018-01-28 18:05:57 -08:00
elgeonmb
1326c42398 humans can be older 2018-01-28 14:13:34 -08:00
Cyantime
6a688c2f26 Removes sleep from fusion fuel injection 2018-01-28 15:07:57 -05:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629) 
* Onyonyon

* Fixes Potato's and adds Changelog.
 2018-01-27 16:53:54 -08:00
Anewbe
13310d048c Makes the large size modifiers less extreme (#4631) 2018-01-27 16:53:22 -08:00
Cyantime
3b71498ddc Fixes potato reagentID (#4637) 
* Vodka can be produced again
 2018-01-27 16:52:40 -08:00
Arokha Sieyes
7366a1307c POLARIS: Sort jobs into correct departments 
Also give cargo some color
 2018-01-27 14:57:43 -05:00
Arokha Sieyes
7915d5ea99 POLARIS: Shuttle connector object for lateloaded Z-levels and other stuff 2018-01-27 14:54:30 -05:00
Arokha Sieyes
2907da264f Fixes #4643 2018-01-27 14:46:50 -05:00
elgeonmb
3d5740c909 adds an e-reader full of news to the loadout (#4619) 
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster
 2018-01-25 18:18:35 -06:00