cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 13:48:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
5544 Commits
Author SHA1 Message Date
Ghommie 643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Putnam 801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00
Ghommie 65899bf906 Removing cargo "paperwork" and a few other bloat packs. 2020-05-03 19:56:00 +02:00
Ghommie 76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" 2020-05-03 07:12:41 +02:00
Ghommie b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Enric Gabriel 570683f344 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-02 20:15:34 -03:00
kevinz000andGitHub 5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3 
Webedit bugfixes
 2020-05-02 15:56:22 -07:00
kevinz000andGitHub b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717 
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
 2020-05-02 15:55:19 -07:00
kevinz000andGitHub fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
Enric Gabriel 2cd58a97e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-02 17:13:38 -03:00
LinandGitHub f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghommie 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie 7ae2615f51 Whops. 2020-05-02 19:13:21 +02:00
Ghommie c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
GhomandGitHub 8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
GhomandGitHub 400e2523c2 paint remover issue webedit. 2020-05-02 00:55:18 +02:00
Enric Gabriel 959316f715 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-01 19:27:34 -03:00
Ghommie b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
kevinz000andGitHub ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 
toylathe copypasta removal and preparations for economy public lathe nerf.
 2020-05-01 14:52:29 -07:00
Enric GabrielandGitHub a6471b6e47 Tiny fan tweak (#3) 
* too quick

* space
 2020-05-01 17:26:49 -03:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
Enric GabrielandGitHub cbde40f203 Tiny fan crafting (#2) 2020-05-01 16:30:12 -03:00
kevinz000andGitHub f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
Ghommie a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
kevinz000andGitHub 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
ZeroMan 52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-04-30 13:48:48 -04:00
kevinz000andGitHub d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft 
More Useful Gauze MK II
 2020-04-29 12:02:51 -07:00
kevinz000andGitHub 57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07:00
LinandGitHub 64a5831a28 Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2 
Fixes cybernetics not updating slowdowns when dropping shield
 2020-04-29 01:07:55 +00:00
ZeroMan 18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan 8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
TrilbySpaceClone 5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
kevinz000andGitHub 4e8a8dbebd Update items.dm 2020-04-27 02:55:11 -07:00
kevinz000 f70490c61d fixes 2020-04-26 04:40:18 -07:00
kevinz000 2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000 ff9f18bdbd wow lotsa effort huh 2020-04-26 03:38:41 -07:00
kevinz000 bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000 aeaf6ea102 wow lotsa effort huh 2020-04-26 03:33:08 -07:00
kevinz000 e3b987879e wow lotsa effort huh 2020-04-26 03:30:18 -07:00
kevinz000 a9d0ce45b9 wow lotsa effort huh 2020-04-26 03:29:43 -07:00
kevinz000 af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
kevinz000andGitHub 5c20bde9f0 Update shields.dm 2020-04-25 20:58:22 -07:00
kevinz000andGitHub 565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351 
Nerfs spiders defence stat against flyswatters - Alt  Australian crew buff.
 2020-04-25 17:10:33 -07:00
kevinz000andGitHub af08e0fecf Merge pull request #11984 from Hatterhat/fastpump 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
 2020-04-25 17:07:29 -07:00
kevinz000andGitHub da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
LinandGitHub 499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704 
porting CEV-Eris pickweight procs.
 2020-04-25 18:30:26 +00:00
Ghommie 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie fecf6cef2f Coin can be inserted in ID cards now. 2020-04-25 14:22:49 +02:00