cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 7 Branches 0 Tags
0914aad76576b6a6be5626455be13f73b0449b51
Commit Graph

200 Commits

Author SHA1 Message Date
CHOMPStation2
93d48c1680 [MIRROR] ports matrix recolouring, Ports Colourmate update, ports simple mob/robot recolouring from CHOMP (#7997) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-03-18 17:43:40 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
BlackMajor
6f9f78213d Merge branch 'master' into matrices 2023-04-30 16:14:51 +12:00
Heroman3003
d99151151c Resolves SDMM warnings 2023-03-09 05:20:12 +00:00
BlackMajor
818f2d64e0 yeah 2023-03-02 20:41:12 +13:00
Seris02
e41a824496 better observe messages 2023-02-28 14:03:40 +08:00
Raeschen
52a70fe414 Remove ghost join/leave notifications 2023-02-26 01:18:42 +01:00
Novacat
22e1a26d4e Merge pull request #13737 from Heroman3003/admin-toggles 
Some staff-specific pref staff
 2022-09-15 13:52:38 +00:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Razgriz
c7d8f6dcc5 powder that makes you say yes 2022-05-10 22:03:23 -07:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
BlackMajor
b950be88fa Removes baymiss 2022-02-13 20:29:26 +13:00
Aronai Sieyes
12d8d8f592 Merge pull request #11681 from VOREStation/upstream-merge-8326 
[MIRROR] You can't feed drinks to borgs
 2021-10-28 01:25:13 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Aronai Sieyes
50c69ffd77 Merge pull request #10528 from VOREStation/Arokha/ghostmusic 
Allow ghosts to partake in music
 2021-06-02 16:01:48 +00:00
Nadyr
31b47bc0d1 powder that makes you say yes 2021-05-12 18:20:23 -04:00
Unknown
fd3a02f318 Fixes SSMobs Shattering due to Proteans 
Port of https://github.com/PolarisSS13/Polaris/pull/8073
 2021-05-11 03:31:24 -05:00
Razgriz
17ceac5017 Missing ) 2020-11-24 02:19:24 -07:00
Razgriz
85ace9258d Add lasertag weapons to the list 2020-11-24 02:17:06 -07:00
Razgriz
f0ed6e20ea Beepsky ignore certain guns 
Ignores size gun, flora gun, and confetti cannon
 2020-11-24 01:41:46 -07:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Atermonera
a175e70865 Merge pull request #6354 from MagmaRam/eyestabs 
Adds proper miss chance for stabbing people in the eyes.
 2019-07-30 20:19:46 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Anewbe
935fb1ed06 Merge pull request #5669 from VOREStation/pol-binocs 
Stop usage of multiple vision modifiers
 2018-10-15 15:51:43 -04:00
Anewbe
d36e67d90d Merge pull request #5064 from VOREStation/vs-port-3142 
[PORT] Improved playsound and drop_location() from /tg
 2018-03-17 15:01:07 -05:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha Sieyes
4686f6fcc4 POLARIS: Port's /tg/'s current sound.dm, plus pref 
It's mostly the same, just a little more efficient. I added a 'preferences' var to pass a datum and decide whether or not to play the sound for that client based on some preference.
 2018-03-13 17:46:40 -04:00
Arokha Sieyes
96b0416c7f U_I Phase 2.3: Further cleanup 2018-03-08 19:34:00 -05:00
Arokha Sieyes
53a185f838 U_I Phase 2.0: Code cleanup 
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
 2018-03-08 19:33:44 -05:00
Arokha Sieyes
aa9ec19118 U_I Phase 1.0: First consolidation pass 2018-03-08 19:31:43 -05:00
Arokha Sieyes
dec6941fea Fix for borgs accidentally getting into useless grab/disarm intents 2018-02-16 22:46:43 -06:00
Arokha Sieyes
e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Anewbe
534a588a6a Gun changes (#4185) 
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
 2018-02-12 23:12:14 -08:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545) 
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
 2018-01-17 13:45:54 -06:00
Atermonera
3210625822 Admins can see dsay again 2018-01-02 17:11:50 -08:00
Anewbe
ae6583e5fb Cleans up some Event Manager code 2017-11-03 16:24:36 -05:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again 
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
 2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
Neerti
d6683be3ce Adjusts Changelings 
See PR
 2017-04-23 13:22:32 -04:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103) 
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
 2017-03-22 14:30:07 -05:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00