shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,675 Commits 5 Branches 0 Tags
a415453540887b5757b72bb7c3a2db874b6c6dcb
Commit Graph

9530 Commits

Author SHA1 Message Date
silicons
a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons
8fe45263c5 whew 2021-04-26 22:58:30 -07:00
silicons
02b40589fe conflict gone 2021-04-26 22:46:16 -07:00
silicons
7ccb5bc711 fixes 2021-04-26 14:21:59 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
silicons
f0c2188c5f Merge pull request #14443 from necromanceranne/baton_change_pr 
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
 2021-04-20 05:52:59 -06:00
silicons
821511e64e Merge pull request #14571 from BlueWildrose/piracyisillegal 
Space pirate sleepers can now be crowbared to be destroyed
 2021-04-18 19:38:41 -06:00
BlueWildrose
911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
silicons
b41790842b Merge pull request #14546 from Putnam3145/bluespace-pipe 
Ports bluespace pipes from yogs
 2021-04-18 18:53:14 -06:00
silicons
0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes 
Cargo bugfixes
 2021-04-18 18:52:54 -06:00
silicons
73d5b99b64 Merge pull request #14625 from Hatterhat/patch-4 
solars plastitanium glass fix
 2021-04-18 18:52:29 -06:00
silicons
757db58ef5 Merge pull request #14617 from keronshb/dragnetadjust 
CONSITENCY: Matches Dragnet breakout time to Energy Bolas
 2021-04-18 18:51:01 -06:00
silicons
9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate 
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
 2021-04-18 18:50:37 -06:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option 
Activity tracking; traitor class tweaks
 2021-04-18 18:49:27 -06:00
silicons
02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles 
ports deathrattle implants but without mob statchange because i am not gonna port that today
 2021-04-18 18:48:08 -06:00
silicons
30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui 
TGUIZES the cloning computer
 2021-04-17 17:00:49 -06:00
Hatterhat
4186b15a69 plastitanium glass OSC 2021-04-17 16:51:08 -05:00
keronshb
77806ad216 Adjusts Dragnet to match Ebola 
Consistency
 2021-04-15 20:58:30 -04:00
DeltaFire
9e88139433 no 2021-04-16 01:07:46 +02:00
Lin
e07854f3c3 Merge pull request #14605 from DeltaFire15/tank-dispensers 
Fixes tank dispensers being unusable by borgs
 2021-04-14 21:39:33 -05:00
Lin
f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff 
Pirate related fixes and communication console fixes
 2021-04-14 21:39:06 -05:00
The0bserver
c313ba38b8 adds the .38 2021-04-14 01:26:24 -04:00
The0bserver
27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
SandPoot
a745431155 better this 2021-04-13 17:26:46 -03:00
SandPoot
330a3b8c9a upload files 2021-04-13 17:25:08 -03:00
DeltaFire
f1e1169e85 dispenser moment 2021-04-13 17:33:04 +02:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
a62d942bee telescopic batons now have a message when being toggled. you can now threateningly point extended telebatons at people. (#14580) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-04-13 10:22:01 +02:00
Blue Wildrose
8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver
e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
qweq12yt
7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
zerothebigboy
a7c061392b i hate tg code 2021-04-08 18:05:36 -04:00
silicons
08cd9b1bfd Merge pull request #14576 from SandPoot/another-locker-change-thing 
Another closet change
 2021-04-08 03:24:59 -06:00
silicons
b2fcded98d Merge pull request #14577 from SandPoot/fixes-machines 
Prevents machines that open from dropping their components
 2021-04-08 03:24:51 -06:00
silicons
3416989b7c Merge pull request #14552 from BlueWildrose/PillsHere 
I could blot the sun out with these titty pills and some certain catgirls here STILL wouldn't be satisfied.
 2021-04-08 03:23:32 -06:00
silicons
f1de2d37aa Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat 
Adds telescopic baseball bat
 2021-04-08 03:22:56 -06:00
SandPoot
c15852f47b upload _machinery.dm 2021-04-06 19:27:52 -03:00
SandPoot
29bf226fe1 upload closets.dm 2021-04-06 18:18:08 -03:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
 2021-04-06 04:10:00 -06:00
BlueWildrose
de6b3552d5 that grammar would make me mad if I left it there why did I do that 2021-04-05 22:59:24 -07:00
Blue Wildrose
80e9437390 add some game logging for good measure 2021-04-05 21:47:15 -07:00
Blue Wildrose
fb79a2033d usr.name into user, also adding in do_after. 2021-04-04 21:34:27 -07:00
Lin
c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops 
Fixing some issues for laptops and lockers/crates.
 2021-04-04 23:22:41 -05:00
Blue Wildrose
414d9d43e3 adding a gap here 2021-04-04 18:50:11 -07:00
Blue Wildrose
43d855c413 Killable space pirate sleepers 2021-04-04 17:05:18 -07:00