cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-05 22:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,472 Commits 6 Branches 0 Tags
02a5bbd8fcd5e78331eefaa3d3f557ca92d13cdb
Commit Graph

28448 Commits

Author SHA1 Message Date
Razgriz b7d964f87a Merge pull request #1177 from CHOMPStationBot/upstream-merge-9604 
[MIRROR] [MIRROR] Mech Appearance Update
 2021-01-27 18:58:35 -07:00
Razgriz 4fb89f93d5 Merge pull request #1194 from Sharkmare/Circuitry-fix 
Fixes input pads and adds ?:
 2021-01-27 18:44:29 -07:00
Razgriz 99d137254d Merge pull request #1196 from CHOMPStationBot/upstream-merge-9614 
[MIRROR] Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 18:43:55 -07:00
Razgriz a0cf35dc49 Merge pull request #1204 from cadyn/attacklogsql 
Porting attack logs to use SQL
 2021-01-27 18:12:18 -07:00
Razgriz 5bfa8593db Merge pull request #1203 from CHOMPStationBot/upstream-merge-9618 
[MIRROR] Some minor fixes
 2021-01-27 18:11:47 -07:00
Cadyn be51ec1b85 Porting attack logs to use SQL 2021-01-27 16:59:27 -08:00
Novacat 9f977f893f Merge pull request #9618 from Novacat/nova-basicfixes 
Some minor fixes
 2021-01-27 22:09:25 +00:00
Cadyn 00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Novacat 2f8602243d Merge pull request #9614 from Heroman3003/belly-cap-fix-rename 
Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 02:24:52 +00:00
Sharkmare 952502ec93 Typo fix and boolean latch 2021-01-26 13:08:37 +01:00
Sharkmare 395c8624a7 Fixes an overisght and adds Heakth scanner species and size 
Makes the conditional circuit actually work also adds size and species checks to the medical scanner
 2021-01-26 12:48:40 +01:00
cadyn e3a5367009 Merge pull request #1193 from cadyn/tgsql 
Porting TG's SQL
 2021-01-26 01:58:29 -08:00
Sharkmare 41211cb3c3 Fixes input pads, adds ?: 
This adds the conditional operator as a circuit.
This also fixes all of the input pads like the numberpads etc
 2021-01-26 10:36:48 +01:00
Cadyn 76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
Novacat 4d482a98ca Merge pull request #9613 from VOREStation/upstream-merge-7840 
[MIRROR] Renamed a meme + cinnamon bun sprite.
 2021-01-26 05:17:51 +00:00
cadyn b379c65606 Merge pull request #1191 from cadyn/master 
The logenning: Privacy begone, and Moderators having context and evidence welcome.
 2021-01-25 18:45:05 -08:00
Cadyn 95ac7036b6 fixy wixy 
was working on my local machine but since we have a different name for the db on the server a little oopsie made the verb unable to get any logs
 2021-01-25 18:34:46 -08:00
cadyn de5813bf67 Merge pull request #1172 from CHOMPStationBot/upstream-merge-9601 
[MIRROR] Should fix the broken species
 2021-01-25 16:16:25 -08:00
cadyn 70253b582f Merge pull request #1189 from CHOMPStationBot/upstream-merge-9571 
[MIRROR] Allows feeding synths with the lewd trait
 2021-01-25 16:06:05 -08:00
cadyn cb74ad2b41 Merge branch 'master' into upstream-merge-9601 2021-01-25 16:04:40 -08:00
cadyn e815dbe29f Merge pull request #1164 from CHOMPStationBot/upstream-merge-9582 
[MIRROR] Makes most neutral traits available to all species
 2021-01-25 16:02:59 -08:00
Cadyn 95f9b99873 The logenning 2021-01-25 15:25:36 -08:00
Verkister 9abdd9bd48 Merge pull request #9590 from Verkister/affectitems 
Adds a new vorepanel mode addon.
 2021-01-25 22:46:22 +00:00
Verkister 1e96e1d66d Merge pull request #9571 from VOREStation/Verkister-patch-6 
Allows feeding synths with the lewd trait
 2021-01-25 22:41:10 +00:00
cadyn fe84e96797 Revert "Delete defib timer" 2021-01-24 22:48:39 -08:00
cadyn 2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
cadyn 78e9cb2123 Merge pull request #1182 from cadyn/master 
fixing defib timer and adding surgery for that shit
 2021-01-24 21:37:08 -08:00
Cadyn 4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
Nadyr 82bca53ee3 Merge pull request #1180 from CHOMPStationBot/upstream-merge-9606 
[MIRROR] [MIRROR] fixes some sprites, adds a thin blindfold
 2021-01-24 22:53:28 -05:00
Nadyr 07726ed771 Merge pull request #1178 from CHOMPStationBot/upstream-merge-9607 
[MIRROR] [MIRROR] Adds Chicken noodle soup
 2021-01-24 22:43:33 -05:00
Novacat 3954bedb9d Merge pull request #9606 from VOREStation/upstream-merge-7834 
[MIRROR] fixes some sprites, adds a thin blindfold
 2021-01-25 03:09:35 +00:00
cadyn 5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
Novacat d993f24661 Merge pull request #9607 from VOREStation/upstream-merge-7822 
[MIRROR] Adds Chicken noodle soup
 2021-01-25 00:51:19 +00:00
Novacat a4c4d371db Merge pull request #9604 from VOREStation/upstream-merge-7818 
[MIRROR] Mech Appearance Update
 2021-01-25 00:51:12 +00:00
cadyn b3a17b2678 Update 07_traits.dm 2021-01-24 16:16:55 -08:00
cadyn 5b53679fbe Merge branch 'master' into upstream-merge-9582 2021-01-24 09:03:00 -08:00
cadyn 7ce2ef9345 Update neutral.dm 2021-01-24 09:00:50 -08:00
cadyn c059ff700e Merge pull request #1174 from Sharkmare/drone-unify 
Law and subtype preparation for new drones
 2021-01-24 08:47:16 -08:00
cadyn 3c541d7ecb Merge pull request #1176 from Darlantanis/VoreSlug 
Vore slug and forest turf fix
 2021-01-24 08:46:49 -08:00
Darlantan 6b53683dcd Vore slug 
Mob, mob icons, random spawn for mob
 2021-01-24 11:03:35 -05:00
Darlantan eb287bb414 Small oversights in leopardmander and pitcher 2021-01-24 11:01:46 -05:00
Sharkmare 15387c5a80 fixing typo in filename 2021-01-24 16:18:12 +01:00
cadyn c5ae5ec866 Merge pull request #1134 from CHOMPStation2/cadyn-patch-5 
Delete defib timer
 2021-01-24 06:52:37 -08:00
cadyn 4f9ed16579 Merge pull request #1165 from CHOMPStationBot/upstream-merge-9598 
[MIRROR] Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:52:18 -08:00
cadyn 199c0602ea Merge pull request #1166 from CHOMPStationBot/upstream-merge-9597 
[MIRROR] Removes Herm option for biological gender
 2021-01-24 06:50:51 -08:00
cadyn 7743c47718 Merge pull request #1170 from CHOMPStationBot/upstream-merge-9544 
[MIRROR] [MIRROR] Fixes dark click catcher
 2021-01-24 06:49:14 -08:00
cadyn a9e6836bf3 Merge pull request #1169 from CHOMPStationBot/upstream-merge-9573 
[MIRROR] [MIRROR] Gadgets & Gizmos
 2021-01-24 06:48:03 -08:00
Sharkmare 4ed83ee71d Law and subtype preparation for drones 
Defines law subsets and typings for drones, this is step 1 of two, second step will be adding back the tool sets for the unique drones
 2021-01-24 15:22:29 +01:00
Razgriz beaf119524 Update station_vr.dm 2021-01-24 01:21:42 -07:00
Chompstation Bot ed3a6fdcb1 Should fix the broken species 2021-01-24 08:13:31 +00:00