cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-04 14:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,341 Commits 55 Branches 0 Tags
147a905b5d4f6bbb51aeb51e6b45f7a58dd9a44f
Commit Graph

930 Commits

Author SHA1 Message Date
Lin
e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes 
removing vog's ability to commit sin, probably
 2020-07-13 11:31:25 -05:00
Hatterhat
eb0e0b6cbd i may not test my shit but at least i can have less line changes motherfucker 2020-07-11 23:18:17 -05:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool 
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
 2020-07-04 14:12:43 -05:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823 
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
 2020-07-02 01:44:09 -07:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
silicons
f03343b516 fix 2020-06-30 05:19:50 -07:00
silicons
7a2818d657 fix 2020-06-29 23:45:18 -07:00
silicons
6a91ce8416 fix 2020-06-29 23:43:53 -07:00
silicons
3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
6e90560173 Nerfs natural stamina recovery outside of stam-crit. 2020-06-28 02:40:16 +02:00
silicons
1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
kevinz000
f2e905cb83 Update lobotomy.dm 2020-06-13 16:06:18 -07:00
kevinz000
9229c1dc0d Update lobotomy.dm 2020-06-13 13:12:54 -07:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Trilbyspaceclone
0b0e9011a7 Prevent surgery tools and items from being rad contaminatable (#12413) 
* Update tools.dm

* Update tools.dm

* Update robot_modules.dm
 2020-06-04 15:56:15 -07:00
Ghom
d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Arturlang
32135cc008 Makes bloodsuckers unguttable and undecappable (#12335) 
* Bloodsuckers cant be gutted or beheaded anymore

* Mistakes were made
 2020-05-24 13:08:18 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Lin
c857dc9cd1 Merge pull request #12321 from Ghommie/Ghommie-cit779 
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
 2020-05-22 21:36:00 +00:00
Ghom
7f38e0714b Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302) 
* Skill calculation fixes, tweaks, antag and brain damage modifiers.

* Experience through patience.

* Priority Fix etcetera.
 2020-05-20 18:42:58 -07:00
Ghommie
50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. 2020-05-21 03:04:26 +02:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
kevinz000
616d104c23 Merge pull request #12189 from Ghommie/Ghommie-cit735 
Skill modifier datums.
 2020-05-14 04:46:24 -07:00
Putnam
8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
Putnam
f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
kevinz000
1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
Ghommie
667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Ghommie
300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Putnam3145
3531459d8b Some trauma rebalancing (#12144) 
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
 2020-05-09 01:42:39 +02:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Ghommie
f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Lin
793cbd6cbd Merge pull request #12094 from Ghommie/Ghommie-cit719 
Makes privates not drop upon disembowelment or gibbing.
 2020-05-03 21:24:44 +00:00
kevinz000
fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
Ghommie
592198d659 Makes privates not spew around upon disembowelment or gibbing. 2020-05-02 20:01:54 +02:00
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00