cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,111 Commits 8 Branches 0 Tags
6ffab8bada8a131e6607374a690e4e0c4067d40a
Commit Graph

35130 Commits

Author SHA1 Message Date
Heroman3003
6ffab8bada Synthetic chassis taur body 2023-06-17 23:57:43 +02:00
Raeschen
fd87fd5da1 Merge pull request #6367 from Sharkmare/patch-36 
Change "Admin Login:"
 2023-06-17 23:46:46 +02:00
Raeschen
5b6758eb2a Merge pull request #6357 from CHOMPStation2/upstream-merge-15007 
[MIRROR] Larger cobra hood
 2023-06-17 23:44:36 +02:00
Raeschen
48994cada8 Merge pull request #6354 from CHOMPStation2/upstream-merge-14987 
[MIRROR] Alternate to https://github.com/VOREStation/VOREStation/pull/14959 New Admin verb: Report Player Status
 2023-06-17 23:32:48 +02:00
Raeschen
3a8f28c2c5 Merge pull request #6351 from CHOMPStation2/upstream-merge-14961 
[MIRROR] "Hey bud, need a light?"
 2023-06-17 23:09:05 +02:00
Raeschen
c9d7a12694 Merge pull request #6346 from CHOMPStation2/upstream-merge-14992 
[MIRROR] Tweaks Long Predatorial Reach (Persistence, trait panel)
 2023-06-17 23:01:24 +02:00
Raeschen
207ea513c9 Merge pull request #6341 from CHOMPStation2/upstream-merge-14991 
[MIRROR] New mermaid tails
 2023-06-17 22:58:23 +02:00
Raeschen
22f6c33c84 Merge pull request #6336 from ItsSelis/selis-runtime-fixes 
A few nullchecks
 2023-06-17 22:54:57 +02:00
Raeschen
5b793680eb Merge pull request #6333 from CHOMPStation2/upstream-merge-14977 
[MIRROR] Adds altevian ramen and taco to altevian vendor
 2023-06-17 22:50:27 +02:00
Raeschen
e7073baa8e Merge pull request #6327 from CHOMPStation2/upstream-merge-14963 
[MIRROR] Space Traffic Revisions
 2023-06-17 15:20:15 +02:00
Raeschen
7c5f1f6049 Merge pull request #6314 from CHOMPStation2/upstream-merge-14957 
[MIRROR] Fixes #14956
 2023-06-17 15:12:04 +02:00
Raeschen
2498d480af Merge pull request #6393 from Rykka-Stormheart/shep-dev-simplemob-slow-fix 
Fixes Simplemob Slowdown for CHOMPStation
 2023-06-17 15:11:15 +02:00
Rykka Stormheart
768d250350 Fixes Simplemob Slowdown for CHOMPStation 
Also fixes Promethean blob movement, finally.
 2023-06-17 06:04:09 -07:00
Raeschen
54dd4b7ee9 Merge pull request #6312 from CHOMPStation2/upstream-merge-14955 
[MIRROR] Adds functionality to buildmode's AI mode to adjust a.i wander behavior
 2023-06-17 14:49:18 +02:00
Raeschen
3419ec2111 Merge pull request #6161 from CHOMPStation2/upstream-merge-14827 
[MIRROR] Make synth medicines tell medical you are dying
 2023-06-17 14:43:37 +02:00
Raeschen
28db175831 fine have it your way 2023-06-17 14:30:22 +02:00
Raeschen
42fcb6b98a god damnit upstream 2023-06-17 14:26:18 +02:00
Raeschen
3c94c16698 Update 05_health.dm 2023-06-17 14:21:10 +02:00
Raeschen
16a43c0e0b fix merge conflict 2023-06-17 14:20:02 +02:00
Raeschen
d75f897ef8 Merge branch 'master' into upstream-merge-14758 2023-06-17 13:40:40 +02:00
Raeschen
d631e5f691 fix merge conflicts 2023-06-17 13:38:08 +02:00
Raeschen
1c8cb00b7f Merge pull request #6088 from CHOMPStation2/upstream-merge-14756 
[MIRROR] Preferred Language + Autohiss Default Options
 2023-06-17 13:25:34 +02:00
Raeschen
d4992917ce Fix merge conflicts 2023-06-17 13:07:51 +02:00
Raeschen
8a45e72bb7 sync the fluff (but comment out) 2023-06-17 11:59:50 +02:00
Raeschen
4d36ac9097 fix chompedited fluffitems 2023-06-17 11:50:36 +02:00
Raeschen
ab0c4e7166 resync files to upstream 2023-06-17 11:44:04 +02:00
Heroman3003
071cdb22f1 Selective Markings Port 
Rebase to master
 2023-06-17 09:52:59 +02:00
Razgriz
f571d6cb7d Merge pull request #6376 from CHOMPStation2/upstream-merge-15026 
[MIRROR] Re-adjusts Altevian Weapons
 2023-06-16 11:40:08 -07:00
Razgriz
4361f83fb2 Merge pull request #6380 from CHOMPStation2/upstream-merge-15029 
[MIRROR] feature: Adds admin logging to disposals incidents
 2023-06-16 11:38:36 -07:00
Seris02
cf690461db ip whitelists 2023-06-16 16:47:05 +08:00
Heroman3003
5a2b7dd32c Merge pull request #15029 from Runa-Dacino/disposals 
feature: Adds admin logging to disposals incidents
 2023-06-16 06:30:29 +00:00
Heroman3003
bcd039779a Merge pull request #15026 from Enzo-Leon/weapons-tune 
Re-adjusts Altevian Weapons
 2023-06-15 23:11:17 +00:00
Sharkmare
f4b3325c1e Staff Logout notice 2023-06-15 14:56:26 +02:00
Sharkmare
8bfd87068f Change "Admin Login:" 
Change "Admin Login:" to "Staff Login:"
This is because realistically its logging more than JUST admins so the name annoys me personally, feel free to not merge lmao
 2023-06-15 13:05:36 +02:00
FoxglovePurpur
64b47796ca Update pai.dm 
Fixed the comment <3
 2023-06-13 14:13:27 -07:00
FoxglovePurpur
11cb4b2bde Update pai.dm 
Added missing comment.
 2023-06-13 14:08:33 -07:00
Digi Purpur
da120bab14 GPS Text and Spelling Fixes 
The GPS on/off text was reversed and this fixes it. Along with a couple others. The largest "change" is the change of posessed to possessed (since it requires an actual file-name change.)
 2023-06-13 13:35:53 -07:00
Heroman3003
0ba253d1d7 Larger cobra hood 2023-06-11 20:21:10 +00:00
Heroman3003
d342458b6c Merge pull request #14987 from Runa-Dacino/alternatesolution 
Alternate to https://github.com/VOREStation/VOREStation/pull/14959 New Admin verb: Report Player Status
 2023-06-10 04:06:26 +00:00
Nadyr
443303d900 Merge pull request #6335 from ItsSelis/selis-lighting 
Lighting subsystem update
 2023-06-09 22:32:19 -04:00
Nadyr
b6fffdf176 Merge pull request #6318 from Seris02/corpsesensors 
stops vox npcs from showing up on sensors
 2023-06-09 22:31:00 -04:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 
[MIRROR] Little Weakref Refactor
 2023-06-09 22:27:56 -04:00
Nadyr
c036c32091 Merge branch 'master' into upstream-merge-14957 2023-06-09 22:27:00 -04:00
Nadyr
8280d28d5f Merge pull request #6311 from CHOMPStation2/upstream-merge-14821 
[MIRROR] 2023 EnerGen Power Cells
 2023-06-09 22:23:14 -04:00
Nadyr
d83d7fcd3c Merge pull request #6306 from CHOMPStation2/upstream-merge-14954 
[MIRROR] Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter
 2023-06-09 22:19:01 -04:00
Nadyr
14946b1aca powder that makes you say yes 2023-06-09 22:10:20 -04:00
Nadyr
002a1e1ce3 Merge pull request #6301 from CHOMPStation2/upstream-merge-14946 
[MIRROR] Changes bloodsucker subtle mode to use italics rather than bold
 2023-06-09 22:05:10 -04:00
Nadyr
ea3c4ec289 Merge pull request #6299 from CHOMPStation2/upstream-merge-14942 
[MIRROR] Zera's Purple Cloak
 2023-06-09 21:58:40 -04:00
Nadyr
25e871ad78 powder that makes you say yes 2023-06-09 21:57:47 -04:00
Nadyr
e6c29b72a5 Merge pull request #6303 from CHOMPStation2/upstream-merge-14935 
[MIRROR] Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them
 2023-06-09 21:50:24 -04:00