Commit Graph

  • 98cb8767b5 Stealing overlay fix from tg. Verkister 2017-03-19 01:46:56 +02:00
  • cf5a0185b2 Merge pull request #292 from Leon-Leonardo/citadel1.2.0 LetterJay 2017-03-18 14:38:49 -04:00
  • 1927feddf3 Merge pull request #293 from Verkister/master LetterJay 2017-03-18 14:38:35 -04:00
  • 62705e87f6 git is being a butt again Verkister 2017-03-18 14:10:14 +02:00
  • df8d69535b New attempt at fixing shit. Also some sprite stuff. Verkister 2017-03-18 14:08:10 +02:00
  • 00b7dce512 Merge branch 'master' into master Verkister 2017-03-18 12:05:51 +02:00
  • 81956b0502 Inhand overlays fixed. Verkister 2017-03-18 12:02:50 +02:00
  • edc44b2cc5 Overlay fix for the inhand borkage. Verkister 2017-03-18 11:59:03 +02:00
  • e357748da3 Update citadelstation.dm Leon-Leonardo 2017-03-18 02:39:13 -04:00
  • fcb52a6893 added teleporter room added tracking beacons added EVEN MORE to maint and made it the standard deathtrap added carp spawns added more tunnels to the asteroid exterior fixed secure workstations access fixed some fudged wires fixed some fudged areas fixed a couple fudged APC's added plant DNA manipulator lowered the security of the CMO, RD, and CE offices added arcade machines added status displays to cargo fixed Civ Armory access (for real this time) reworked the bar/kitchen/casino area gave the Kinkmate a home added windows to EVA Leon-Leonardo 2017-03-18 00:57:11 -04:00
  • 3f29a01970 Merge pull request #291 from Citadel-Station-13/revert-286-revert-284-revert-281-master LetterJay 2017-03-17 23:54:21 -04:00
  • 9ce20fae93 Revert "Revert "Revert "Little but possibly hella important fixes""" LetterJay 2017-03-17 22:44:45 -05:00
  • 646c0c245d Merge pull request #290 from Citadel-Station-13/revert-289-master LetterJay 2017-03-17 23:44:07 -04:00
  • e41e97a9e9 Revert "Overlay fix" LetterJay 2017-03-17 22:43:41 -05:00
  • e4a33fa115 Merge pull request #289 from Verkister/master LetterJay 2017-03-17 21:20:45 -04:00
  • 3e2cf6ec14 Overlay fix Verkister 2017-03-17 20:13:34 +02:00
  • f2937205ac Merge pull request #286 from Verkister/revert-284-revert-281-master LetterJay 2017-03-16 18:10:42 -04:00
  • 8f3d97291a Merge branch 'master' into revert-284-revert-281-master Verkister 2017-03-16 23:57:37 +02:00
  • 56801458e4 Merge pull request #285 from Leon-Leonardo/citadel.1.1.0 LetterJay 2017-03-16 17:52:26 -04:00
  • a80dae3843 Merge pull request #287 from Verkister/master LetterJay 2017-03-16 17:49:09 -04:00
  • 2158168a4a Merge branch 'master' into master Verkister 2017-03-16 09:22:32 +02:00
  • 545dec9826 Revert "Revert "Little but possibly hella important fixes"" Verkister 2017-03-16 09:14:53 +02:00
  • 429e101e5d Another attempt at fixing air.dm Verkister 2017-03-16 09:03:18 +02:00
  • e62453275c fixed inaccessible chemmaster in chemistry moved hydroponics, replaced it with a Casino added Ian and spare ID's/PDA's to HoP office fixed the security of the Civ armory added cameras to bridge airlocks fixed CE office APC added some redundant powerlines added airlock to R&D entrance fixed stacking machine in cargo and made it so you can put crates on the conveyor added navbeacons for bots added the auxiliary base added escape pod 4 added the "near station" space area where appropriate moved mining shuttle Leon-Leonardo 2017-03-16 01:39:30 -04:00
  • 4c1084327c Merge pull request #284 from Citadel-Station-13/revert-281-master LetterJay 2017-03-15 21:20:42 -04:00
  • ed435e7e2f Revert "Little but possibly hella important fixes" LetterJay 2017-03-15 20:20:22 -05:00
  • be00b14221 Merge pull request #281 from Verkister/master LetterJay 2017-03-15 21:02:12 -04:00
  • be0e52c2f0 Borer_chem_lewd_update (#276) ktccd 2017-03-15 15:42:08 +01:00
  • 41d47301dd Separated the goddamn overlay direction quirk between mobs and turfs since apparently they both misused the same shit in a different way, conflicting like crap! Verkister 2017-03-15 13:52:39 +02:00
  • afb8d2a006 Fixes missing lizard front snouts using the shit-functional "FRONT" layer. (our custom mammal snouts are all on ADJ layer and work just fine) Verkister 2017-03-15 11:30:52 +02:00
  • bb879dfac8 -Fixes overlay stuff such as character creation preview. (one of main runtime issues out there currently) -Probably fixes a missing proc with air runtimes too, which has been one of the problemos appearing in tandem with MC borkage (next line under was MC related anyway) -Husky tail wag sprites renamed correctly (inverted color order). Actual movement yet to come. Verkister 2017-03-15 10:52:00 +02:00
  • de1fe1e2f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Leon-Leonardo 2017-03-15 00:37:01 -04:00
  • d2d4f238ae Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' Leon-Leonardo 2017-03-15 00:35:14 -04:00
  • a4c1198b96 Merge pull request #280 from LetterJay/master LetterJay 2017-03-14 22:41:14 -04:00
  • 45f9c18425 pixels. PIXELS! LetterJay 2017-03-14 19:47:49 -05:00
  • 6585fbf470 over the rainbow LetterJay 2017-03-14 19:38:06 -05:00
  • fd3be49cb4 one day LetterJay 2017-03-14 19:29:29 -05:00
  • b4c2d2ad24 make it stop LetterJay 2017-03-14 19:25:24 -05:00
  • 128557ed24 oops LetterJay 2017-03-14 17:44:38 -05:00
  • 34106df7ef map edits LetterJay 2017-03-14 16:48:38 -05:00
  • d07a217578 removes dupes of old map versions LetterJay 2017-03-14 16:28:08 -05:00
  • 2443306b08 map change LetterJay 2017-03-14 15:55:34 -05:00
  • 9524f76661 Merge pull request #278 from Leon-Leonardo/citadel.1.0.2 LetterJay 2017-03-14 16:44:01 -04:00
  • 4144a627d7 tweaking the file katnep 2017-03-14 20:11:57 +00:00
  • 5e9602265b adds CQC to the traitor mode items katnep 2017-03-14 19:53:44 +00:00
  • 1d2c3635fc Merge branch 'master' into citadel.1.0.2 Leon-Leonardo 2017-03-14 13:55:53 -04:00
  • a8565da849 Citadel Station v1.0.2 Leon-Leonardo 2017-03-14 13:52:14 -04:00
  • 6be091e40a Citadel.1.0.1 (#275) Leon-Leonardo 2017-03-14 05:37:38 -04:00
  • 1fdf69d765 citadelstation.1.0.1 Leon-Leonardo 2017-03-14 02:22:33 -04:00
  • 3bb33103fc Citadel Station v1.0.0 Leon-Leonardo 2017-03-13 02:42:21 -04:00
  • 4f7355a6af Citadel Station v0.9.1 Leon-Leonardo 2017-03-12 20:20:57 -04:00
  • a6bc88092a Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into JMP-n-STUFF TalkingCactus 2017-03-12 12:04:47 -04:00
  • 7c92ca91d3 Merge pull request #3 from Citadel-Station-13/master TaxMaster 2017-03-12 09:09:19 -05:00
  • 83e55e41d1 engine revert (#273) Poojawa 2017-03-12 04:43:24 -05:00
  • 24ca0aeffd Adds Citadel Station to the game (finally). Leon-Leonardo 2017-03-11 22:58:48 -05:00
  • 8889c23827 Merge pull request #2 from Citadel-Station-13/master TaxMaster 2017-03-10 13:52:20 -06:00
  • 51d20e13ef Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into JMP-n-STUFF TalkingCactus 2017-03-10 12:56:18 -05:00
  • c55820d2a6 Adds In Deep from RA2 into the round-start music (#267) TaxMaster 2017-03-10 11:51:50 -06:00
  • 09ec454325 Random Fixes + Dildos (#268) TalkingCactus 2017-03-10 12:51:16 -05:00
  • 097557de4b do it better TalkingCactus 2017-03-10 12:47:28 -05:00
  • 75be9ccba2 Adds In Deep from RA2 into the roundstart music TaxMaster 2017-03-07 15:29:07 -06:00
  • 69a8848110 Adds In Deep from RA2 into the roundstart music TaxMaster 2017-03-07 15:28:21 -06:00
  • c1c3e09d79 Merge pull request #1 from Citadel-Station-13/master TaxMaster 2017-03-07 14:37:23 -06:00
  • 906b8e59d0 disables flight suits, again (#265) TalkingCactus 2017-03-06 16:59:57 -05:00
  • 55595d898d new music (#264) TalkingCactus 2017-03-06 16:59:48 -05:00
  • 733ca2716d I'm retarded TalkingCactus 2017-03-06 15:58:37 -05:00
  • 2adf4e26c8 disables suicide TalkingCactus 2017-03-06 15:56:15 -05:00
  • 3a1d69cc63 Fixes Lattice Building (#263) TalkingCactus 2017-03-05 06:51:18 -05:00
  • 89a87f6ee5 send it, captain (#262) TalkingCactus 2017-03-05 04:30:46 -05:00
  • f0ad0ac08b sql fix LetterJay 2017-03-04 05:26:43 -06:00
  • 849f216c49 Fix DIR for Waste Loop O2 Gas Filter in Atmo (#261) Mr Potato Shaman 2017-03-03 22:16:46 -06:00
  • 97327d2beb Hotfixes for March 3, 2017 (#260) TalkingCactus 2017-03-03 15:15:42 -05:00
  • 8abcb9859b Adds VG roundstart music (#254) TaxMaster 2017-03-03 12:47:24 -06:00
  • 84578c35cd New Sounds for Emitters, Fire Alarms, Sparks, and Maintenance Ambience (#258) TalkingCactus 2017-03-03 00:53:17 -05:00
  • b26c52ebd2 Fixes vendies and glasses (#257) Poojawa 2017-02-28 23:10:46 -06:00
  • 768c644638 Reverts admin ticket system (#256) Poojawa 2017-02-28 23:10:37 -06:00
  • 93fcc0d99f Merge pull request #255 from LetterJay/master LetterJay 2017-02-28 22:46:28 -05:00
  • cf680a63d2 changes most, if not all, the send2irc_adminless_only to send2irc LetterJay 2017-02-28 21:40:52 -06:00
  • 3480265efc reduce meteor chances as well as the chance for everything to fuck up if RNGesus does see it fit to damn you all. LetterJay 2017-02-28 21:28:28 -06:00
  • 42816f916c removes replace_text for them/their to his/her LetterJay 2017-02-28 21:04:37 -06:00
  • 7023a22d61 Fixes Icons and Map (#253) TalkingCactus 2017-02-28 14:02:08 -05:00
  • 0bca862419 Overhauls and 2/28 sync (#244) Poojawa 2017-02-28 09:30:49 -06:00
  • 93782cf716 Adds VG weaponry to the server (#243) TaxMaster 2017-02-28 07:55:22 -06:00
  • 01841a271b Merge pull request #250 from LetterJay/master LetterJay 2017-02-27 17:49:39 -05:00
  • 7074b28401 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-02-27 16:29:50 -06:00
  • 586021483e no click! LetterJay 2017-02-27 16:29:28 -06:00
  • 2cf17f19df New Icons (#249) TalkingCactus 2017-02-27 15:30:12 -05:00
  • da5d98f099 Merge pull request #248 from LetterJay/master LetterJay 2017-02-26 15:15:58 -05:00
  • 672bdb5eea Update update_icons.dm LetterJay 2017-02-26 13:36:43 -06:00
  • 640954498f move everything back to irc LetterJay 2017-02-26 13:29:18 -06:00
  • be40ffe334 usr << to O.visible_message() (#246) TalkingCactus 2017-02-25 12:06:51 -05:00
  • 7e75b904ef fixes runtime (#245) TalkingCactus 2017-02-25 09:06:45 -05:00
  • 36c580c236 The Update (#241) TalkingCactus 2017-02-24 21:42:15 -05:00
  • 82fe4b01be EMP-proof PA (#239) Poojawa 2017-02-20 00:06:03 -06:00
  • bd13d677d4 Sweater Weather (#236) TalkingCactus 2017-02-20 01:05:49 -05:00
  • 2ecae386bb Wolf pAI Chassis (#237) TalkingCactus 2017-02-20 01:05:32 -05:00
  • dd916684ad Adds an autoimplanter to research designs, quite high tech and material needs come with it. (#216) Roland Forgo 2017-02-18 10:15:39 +01:00
  • 0453438a7a Several Balance and Convenience Changes (#235) TalkingCactus 2017-02-18 04:00:27 -05:00
  • ee42eab64f Merge pull request #234 from LetterJay/master LetterJay 2017-02-17 15:47:53 -05:00
  • 8066422c75 fix character switching bug LetterJay 2017-02-17 14:43:06 -06:00