 ShadeAware
|
5b43b2fac7
|
Update recipes_weapon_and_ammo.dm
|
2020-01-30 17:01:28 -05:00 |
|
|
Lin
|
2b47d868ad
|
Merge pull request #10768 from kevinz000/quick_thing
moths can now chitter, and their laughs are now "unique"
|
2020-01-30 21:46:41 +00:00 |
|
|
Tupinambis
|
e5ee5595e0
|
How the fuck was this not fixed for like a year.
|
2020-01-30 15:22:41 -06:00 |
|
|
Ghom
|
15e5f0ef5d
|
Merge pull request #10644 from ShadeAware/master
Craftable Switchblades: The Finale
|
2020-01-30 21:30:55 +01:00 |
|
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
|
Artur
|
db36a90e35
|
Fixes.
|
2020-01-30 19:23:38 +01:00 |
|
|
Ghommie
|
40b6ef79fe
|
reagent projectiles fix.
|
2020-01-30 19:15:07 +01:00 |
|
|
Artur
|
d937ded07c
|
Fixes points
|
2020-01-30 18:54:39 +01:00 |
|
|
Artur
|
d3a9a481a6
|
Further tweaks
|
2020-01-30 18:13:05 +01:00 |
|
|
Artur
|
ee814f39ba
|
Tweaks
|
2020-01-30 18:11:49 +01:00 |
|
|
Ghom
|
d92a67f582
|
I'm sorry what?
|
2020-01-30 18:08:43 +01:00 |
|
|
Ghom
|
63560e191e
|
A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles.
|
2020-01-30 18:03:58 +01:00 |
|
|
Artur
|
1bf2a3e7ca
|
Initial Commit
|
2020-01-30 17:28:02 +01:00 |
|
|
Seris02
|
88e42b2e15
|
*crunch crunch stomp stomp*
|
2020-01-30 18:07:35 +08:00 |
|
|
Seris02
|
bf47daf099
|
MY PRECIOUS! GONE!! GOOOOOONE!!!
|
2020-01-30 17:00:14 +08:00 |
|
|
loginsandylogout
|
7054e697db
|
spacing
|
2020-01-30 02:07:59 -06:00 |
|
|
Commandersand
|
27c915ec75
|
honk
|
2020-01-30 02:04:48 -06:00 |
|
|
kevinz000
|
01a43b2481
|
Update pool_controller.dm
|
2020-01-30 00:07:46 -07:00 |
|
|
Seris02
|
dbb6218e0d
|
merp
|
2020-01-30 14:54:07 +08:00 |
|
|
kevinz000
|
b5134e5197
|
Update pool_controller.dm
|
2020-01-29 23:01:06 -07:00 |
|
|
Seris02
|
afb4bebf2d
|
merge conflicts
|
2020-01-30 12:47:48 +08:00 |
|
|
Seris02
|
beb90d39a6
|
polychromic winter coat
|
2020-01-30 12:44:40 +08:00 |
|
|
kevinz000
|
1a439b8758
|
Update stun.dm
|
2020-01-29 20:51:31 -07:00 |
|
|
kevinz000
|
0612649eb7
|
Update stun.dm
|
2020-01-29 20:50:06 -07:00 |
|
|
kevinz000
|
e6e545b1f2
|
Merge pull request #9860 from Ghommie/Ghommie-cit374
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
|
2020-01-29 20:15:22 -07:00 |
|
|
Ghom
|
c96267eb06
|
Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9
CAPTURE THE FLAG NOW HAS CLAYMORES
|
2020-01-30 04:01:17 +01:00 |
|
|
Ghom
|
96e6e5903d
|
Merge pull request #10783 from r4d6/fix
AAAAAAH
|
2020-01-30 04:00:07 +01:00 |
|
|
r4d6
|
cd048ebd77
|
AAAAAAH
|
2020-01-29 21:50:55 -05:00 |
|
|
Ghommie
|
05567e2292
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538
|
2020-01-30 03:42:50 +01:00 |
|
|
kevinz000
|
831fafb72b
|
Update dueling.dm
|
2020-01-29 19:06:11 -07:00 |
|
|
kevinz000
|
562659b5b8
|
Update dueling.dm
|
2020-01-29 19:00:11 -07:00 |
|
|
Ghommie
|
0dba1b5102
|
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
|
2020-01-30 02:17:02 +01:00 |
|
|
kevinz000
|
9df12f94d4
|
Merge branch 'master' into one_last_taser_attempt
|
2020-01-29 16:27:58 -07:00 |
|
|
Ghom
|
f74475a6e0
|
Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
|
2020-01-30 00:19:37 +01:00 |
|
|
kevinz000
|
e3a3c8f241
|
woops
|
2020-01-29 15:45:57 -07:00 |
|
|
Hatterhat
|
41a3dc64d5
|
what
|
2020-01-29 16:44:01 -06:00 |
|
|
Lin
|
cde6601c60
|
Merge pull request #10759 from Ghommie/Ghommie-cit534
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-29 19:58:26 +00:00 |
|
|
Lin
|
293e6576c8
|
Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
|
2020-01-29 19:25:13 +00:00 |
|
|
r4d6
|
c57dedd808
|
fix
|
2020-01-29 12:30:05 -05:00 |
|
|
Seris02
|
1a40bec44b
|
merge maybe fix
|
2020-01-29 18:45:21 +08:00 |
|
|
Seris02
|
e6f8f478d7
|
prototype
|
2020-01-29 18:43:15 +08:00 |
|
|
Ghommie
|
20e08d992f
|
Removing unused vore files and commented out code.
|
2020-01-29 06:38:09 +01:00 |
|
|
Ghommie
|
da90b67d07
|
Removes an unused file and outdated procs.
|
2020-01-29 06:01:23 +01:00 |
|
|
Ghom
|
7839724013
|
Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
|
2020-01-29 05:34:49 +01:00 |
|
|
Ghom
|
dca1d8bcd3
|
Merge pull request #10761 from Putnam3145/fix-forced-gender
Makes gender change potion not work on people with pref
|
2020-01-29 05:31:18 +01:00 |
|
|
necromanceranne
|
f9d6a9b9c4
|
Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc
|
2020-01-29 14:23:50 +11:00 |
|
|
Detective Google
|
cc2ce746d8
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-28 20:19:55 -06:00 |
|
|
Ghom
|
44c141f009
|
Merge branch 'master' into hugbox_meteor_time
|
2020-01-29 02:28:12 +01:00 |
|
|
Ghom
|
cf3466252e
|
Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
|
2020-01-29 01:59:09 +01:00 |
|
|
kevinz000
|
d3343a1e26
|
Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
|
2020-01-28 17:59:00 -07:00 |
|