Commit Graph

27896 Commits

Author SHA1 Message Date
silicons
a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons
eb2c12ceee yell wip 2021-04-26 23:10:10 -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
7c1358a39d Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
TGUI Select Equipment menu
2021-04-25 17:10:09 -06:00
SandPoot
c2b7140ddd upload icons.dm 2021-04-24 21:43:12 -03:00
SandPoot
90661d3687 upload files 2021-04-24 21:37:01 -03:00
silicons
d07f1f3d30 Update radioactive.dm (#14615) 2021-04-24 21:51:53 +02:00
WanderingFox95
ace2f522fb No more Suicidal Parrots! (Ready) (#14628)
* Modifies Parrots

They spawn from hostile triggers, not as friendly pets now.

* Removes Parrots from Gold Extracts altogether
2021-04-24 21:47:04 +02:00
DrPainis
7d6cb67c91 literally just changes one letter (#14634) 2021-04-24 21:40:41 +02:00
silicons
0534f70ccd Update bitfields.dm (#14645) 2021-04-24 21:29:53 +02:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
Lin
0c5d19ecc8 Merge pull request #14633 from Citadel-Station-13/silicons-patch-24
fixes a slightly important thing
2021-04-22 18:28:35 +00:00
silicons
75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
2021-04-21 13:50:46 -06:00
silicons
8510542260 Update autobunker.dm 2021-04-20 04:55:00 -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
silicons
cb87f798c3 Merge pull request #14631 from keronshb/slaughtereventlower
Kev please don't kill me for a one number change but this lowers Slaughter Demon Weight
2021-04-18 19:13:24 -06:00
keronshb
c872055821 Lowers demons weight
Bit too hjgh
2021-04-18 21:03:54 -04:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
BlueWildrose
911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
silicons
af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
silicons
848f1fc50d Merge pull request #14578 from qweq12yt/louder-sm-delams
LOUDER DELAMS
2021-04-18 18:57:47 -06: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
9c780f7672 Merge pull request #14624 from DrPainis/patch-9
adds ash drake meat
2021-04-18 18:51:34 -06:00
silicons
5ec71d5beb Merge pull request #14621 from LetterN/patch-7
Easy area bflag editing
2021-04-18 18:51:24 -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
cd9ccb82d7 Merge pull request #14594 from DrPainis/patch-7
Makes insect blood not look like diarrhea.
2021-04-18 18:49:43 -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
791f2bb746 Merge pull request #14592 from zeroisthebiggay/patch-8
ports "Allow Revenants to read deadchat" from TG
2021-04-18 18:48:01 -06:00
silicons
52a4a5a042 nothing to see here folks 2021-04-18 08:29:51 -07:00
The0bserver
34e6a179ad By popular request 2021-04-17 21:29:19 -04:00
silicons
9d4a9a6677 Update functions.dm 2021-04-17 16:22:13 -07:00
silicons
bb50a4f160 Update topic.dm 2021-04-17 16:21:33 -07:00
silicons
30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui
TGUIZES the cloning computer
2021-04-17 17:00:49 -06:00
silicons
6a181610a9 Merge pull request #14599 from BlueWildrose/revenantevil
Revenant changes port from TG - revenants no longer spend their current essence to unlock new abilities; a fix
2021-04-17 17:00:36 -06:00
Hatterhat
4186b15a69 plastitanium glass OSC 2021-04-17 16:51:08 -05:00
Lin
ab12adaf28 Merge pull request #14622 from DeltaFire15/heal-surgery-oops
Fixes organic repair surgeries showing for targets without any organic bodyparts
2021-04-17 16:07:05 -05:00
DrPainis
ec67182421 makes drakes drop meat 2021-04-17 02:58:22 -04:00
DrPainis
a329188f95 moves list_reagents back to where it was
fuck
2021-04-17 02:56:46 -04:00
DrPainis
ea585233a2 makes goliath meat have reagents again
sorry, I lost my brain cells for a second
2021-04-17 02:56:06 -04:00
DrPainis
c69233c731 adds ash drake meat
yes, it's unnecessary
no, I don't care
let me eat drakes
2021-04-17 02:52:21 -04:00
DeltaFire
d4d9fef82c oop 2021-04-16 16:06:34 +02:00