Commit Graph

26370 Commits

Author SHA1 Message Date
Detective-Google ff6ef5d476 local idiot learns to spell 2020-08-16 00:22:21 -05:00
Detective Google 016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
lolman360 ce8f797bdf wewwewe 2020-08-16 14:04:56 +10:00
Navier fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
lolman360 55b55bab34 workies!! 2020-08-16 12:42:40 +10:00
Detective Google 9b943ec7a9 yee 2020-08-15 21:29:39 -05:00
DeltaFire e611023114 FUCK 2020-08-16 02:53:29 +02:00
kiwedespars 9b5f7f7bb6 buffs mansus grasp.
- ash grasp has 75% cd on proc'd mark again
- rust grasp now emps on hit.
- grasp in general does 60 stam instead of 40, because it's a good idea for solo antags to be able to 1v1 sec
2020-08-15 14:29:32 -07:00
zeroisthebiggay 167ff93675 Update space.dm
t e x t
2020-08-15 17:10:24 -04:00
zeroisthebiggay 730f18b239 Rename code/datums/ru to code/datums/ruins/space.dm
also im an rword
2020-08-15 17:07:51 -04:00
DeltaFire 6e896ea68d more kindle cooldown, some minor stuff
Kindle cast time: 15ds > 25ds
Belligerent moved to the file where it should be and sort priorities modified accordingly.
2020-08-15 23:06:10 +02:00
zeroisthebiggay 04055d34a2 Update and rename code/datums/ruins/space.dm to code/datums/ru
get it space bar
2020-08-15 16:31:17 -04:00
zerothebigboy 3bce862a28 a 2020-08-15 16:27:27 -04:00
zerothebigboy d500052779 a 2020-08-15 16:27:17 -04:00
zerothebigboy 853604b218 a 2020-08-15 16:24:30 -04:00
zerothebigboy a5cac7de3b a 2020-08-15 16:24:22 -04:00
Artur 9772f40fe5 whoops 2020-08-15 22:25:22 +03:00
Artur a97f293a87 Hopefully fixes bloodsucker vassals 2020-08-15 22:24:22 +03:00
silicons b2c65e34fc Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
2020-08-15 08:00:43 -07:00
lolman360 7ca4fa2f55 compilies/?? 2020-08-15 17:09:12 +10:00
Detective-Google f41c412cb9 material -> mineral 2020-08-14 23:41:29 -05:00
Letter N 15a1ffde52 fix 2020-08-15 09:46:50 +08:00
silicons 90234ca065 Merge pull request #13155 from Sishen1542/we-in-the-hood
gives wintercoat hoods rad_no_contaminate flags
2020-08-14 18:19:45 -07:00
MrJWhit 60446316bb Update _flags.dm 2020-08-14 21:14:21 -04:00
Detective-Google 13f6df3991 nerfs plasma cutters 2020-08-14 19:38:14 -05:00
Detective-Google 76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google 81f7307575 yeah 2020-08-14 15:38:27 -05:00
Detective Google 83e1b4f0df woo yeah yeah woo 2020-08-14 15:07:22 -05:00
Lin 2fa0b4ae6c Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
2020-08-14 13:03:25 -05:00
Lin cd89785bc9 Merge pull request #13131 from Citadel-Station-13/silicons-patch-6
gives ethereals underwear
2020-08-14 13:02:18 -05:00
Lin b8ba29e6f8 Merge pull request #13117 from Citadel-Station-13/silicons-patch-3
fixes nanite hubs
2020-08-14 13:01:15 -05:00
Lin ba9a808aaa Merge pull request #13118 from Citadel-Station-13/silicons-patch-4
fixes nanite programmers not ejecting disks
2020-08-14 13:01:08 -05:00
Lin 266109ef45 Merge pull request #13119 from Citadel-Station-13/silicons-patch-5
fixes nanite cloud controllers not dropping disks
2020-08-14 13:00:44 -05:00
Lin e1774fb56f Merge pull request #13133 from Citadel-Station-13/silicons-patch-7
clockwork chairs now keep spinning because it's no longer that laggy to maintain it since it's a processing system instead of while(TRUE) now
2020-08-14 13:00:12 -05:00
Lin d770e29114 Merge pull request #13145 from LetterN/patch-1
makes sleepers use the proper state
2020-08-14 12:58:31 -05:00
kiwedespars aa46e355da more more more.
- sacrifices give 2 charges now.
- books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.)
- books are easier to craft.
2020-08-14 05:19:57 -07:00
lolman360 2ff1529df2 ee 2020-08-14 21:02:00 +10:00
lolman360 0bc79b82eb ABDCE 2020-08-14 20:18:55 +10:00
lolman360 87eec3a9eb weeee 2020-08-14 19:17:09 +10:00
kiwedespars 5fe68dc81d Update dildos.dm 2020-08-14 02:16:43 -07:00
lolman360 67fe32aa13 www 2020-08-14 19:10:29 +10:00
kiwedespars 61486f1287 adds custom parry data. 2020-08-14 01:59:46 -07:00
kiwedespars 53be29d9c2 Update dualsaber.dm 2020-08-14 01:43:47 -07:00
lolman360 1b0152eb48 Create anvil.dm 2020-08-14 18:28:48 +10:00
Artur 4f4b243947 Thats that 2020-08-14 11:12:14 +03:00
Sishen bb94bf25fb e 2020-08-13 21:39:00 -06:00
timothyteakettle 8b4fb136b2 ok fuck it 2020-08-14 02:37:08 +01:00
timothyteakettle a9caceb001 insect fluff! 2020-08-14 02:27:54 +01:00
Hatterhat d572e7c05e turns out there were sealed vehicles 2020-08-13 19:58:45 -05:00
Lin 0c9facf6b5 Merge pull request #13151 from Citadel-Station-13/silicons-patch-11
why did we comment out abductor batons from being buyable
2020-08-13 18:51:39 -05:00