Commit Graph

4277 Commits

Author SHA1 Message Date
cib fda676435e Added a specific sleep message, memes now see their points on the status screen, admin-adding a meme now adds them to the meme list. 2012-05-22 13:55:00 +02:00
cib d887d8ae41 Fixed a few issues with the meme admin stuff. 2012-05-22 13:13:01 +02:00
cib 56b178f396 Implemented #1107. 2012-05-22 11:24:42 +02:00
cib cb02054845 Disable meme voting for now. 2012-05-20 20:43:10 +02:00
cib d087e5791c Fixed grammar mistake. 2012-05-19 22:09:39 +02:00
cib e29315a851 Raised the player requirement for meme to its normal value. 2012-05-19 21:53:15 +02:00
cib d23da5e149 Fixed a bug with meme target selection. 2012-05-19 21:01:01 +02:00
cib 548bcee177 Fixed a bug where you could still whisper when meme-muted. Improved agony a bit. 2012-05-19 20:11:14 +02:00
cib bc782cb575 Merge github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2012-05-19 19:42:30 +02:00
cib 2693d7af71 Another attempt to fix the HUD bug. 2012-05-19 19:38:02 +02:00
cib a571bffe8c Some bugfixes for meme. 2012-05-19 19:08:40 +02:00
cib 84d78fd2f0 Fixed a bug with possession. 2012-05-19 17:52:18 +02:00
cib e57851fbaf Fixed a few bugs with meme. 2012-05-19 16:47:09 +02:00
cib a2e415edb3 Fixed a few compile errors. 2012-05-19 15:25:34 +02:00
cib b941e407d1 Started work on the meme gamemode itself. 2012-05-19 14:42:41 +02:00
cib 19449f77b0 Started work on the meme gamemode itself. 2012-05-19 14:38:52 +02:00
caelaislinn 2b7b06793e reverted problematic ancestor proc call in atmospherics.dm
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-19 20:02:46 +10:00
caelaislinn 1587ad0abc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-19 20:00:05 +10:00
cib 736738dbb4 Fixed bug with meme death. 2012-05-19 11:36:04 +02:00
CIB 165ddcb414 Merge pull request #1096 from Uristqwerty/Minimap
Minimap
2012-05-19 02:07:26 -07:00
CIB 11045b71bb Merge pull request #1097 from Erthilo/TGUpdates
TG Updates r3603 to r3615
2012-05-19 02:03:09 -07:00
Uristqwerty b6e4da901a Things are more complicated than they seemed at first...
... but I think I got it.

Also fixed (hopefully) a number of other AI viewing bugs.
2012-05-19 02:23:37 -04:00
Uristqwerty 36be326da7 This might fix Issue #1048 2012-05-18 22:27:26 -04:00
Erthilo 4406fca8c2 Merge and compile fixes, changelog too. 2012-05-19 02:39:50 +01:00
Erthilo 0cec252e5b Rearranged satchel stuff. 2012-05-19 01:58:53 +01:00
Erthilo d538d91137 TG: - Office chairs are now unanchored and can be pulled around, even when there is
someone on them, making them the perfect prisoner transport vehicle~
- The extinguisher will now tell you when it's empty
- Office chairs and extinguishers.... OH HOW COULD I RESIST. Yes, you can have
extinguisher derby races with office chairs :)

(Shame there are currently no office chairs on the map)
Revision: r3615
Author: 	 baloh.matevz
2012-05-19 01:54:24 +01:00
Erthilo 6e3dd19cc7 TG: - Ported over (Well basically completely recoded) the smooth window code from
Bay 12.
Revision: r3613
Author: 	 baloh.matevz
2012-05-19 01:49:12 +01:00
Uristqwerty 1ce3bce266 Turns out last minute capitalization changes break compiling. 2012-05-18 20:46:29 -04:00
Erthilo 4f0763ada4 TG: - Wallets once again spawn in the satchels in the cabinets in the dorm.
- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it
will return that item to your hand
Revision: r3610
Author: 	 baloh.matevz
2012-05-19 01:44:24 +01:00
Erthilo f76addd642 TG: - Removed hat storage.
Revision: r3608
Author: 	 baloh.matevz

TG: -Added missing door assemblies and associated sprites
Revision: r3609
Author: 	 ericgfw...@hotmail.com
2012-05-19 01:41:04 +01:00
Erthilo 867db1876e TG: -New sprites for Cargo, HoP, and Captain's lockers
-New glass airlocks for science and supply departments
-Added more department-specific door sprites to map
Revision: r3605
Author: 	 ericgfw...@hotmail.com
2012-05-19 01:25:11 +01:00
Erthilo a2503dcd30 TG: -Recipe updates for some booze in an attempt to resolve recipe conflicts. I
think I got them all, please notify if any remain.
-Corgi Techs!
-Added animation to splashy puddles.
Revision: r3604
Author: 	 d_h2...@yahoo.com
2012-05-19 01:16:34 +01:00
Uristqwerty 68edf99569 Finishing the minimap:
- Removed test verb
 - Added verbs for admins, ghosts, and AIs
 - If you open the minimap before it finishes initializing, it will try to update you with missing sections as they become available
2012-05-18 20:12:38 -04:00
Erthilo 7283b862df TG: Moved sinks into watercloset.dm, removed sink.dm
Sink path has changed- /obj/machinery/sink to /obj/structure/sink
/obj/machinery/sink/kitchen2 to /obj/structure/sink/kitchen
Sinks have been slightly updated, if you're wearing gloves, your hands will stay
bloody underneath. Nothing drastic.

Added Cheri's puddles.

Updated showers, they actually clean now. They're pretty powerful, so I'm going
to add a way to make them lethal, to ensure the washing machines still get some
use.

Updated hydroponics trays, to make them work better with soil.

And a couple of map fixes, for toilets that were facing the wrong way in the
prison and on the mining asteroid.
Revision: r3603
Author: 	 petethegoat
2012-05-19 01:08:56 +01:00
cib e31fde8c78 me_verb can now be called by someone other than the user. 2012-05-19 00:13:50 +02:00
cib 8f1be46918 Fixed a syntax error. 2012-05-18 23:38:32 +02:00
cib ced7d810ed mend 2012-05-18 22:59:17 +02:00
cib e2d5fd8de0 Fixed a bug with meme blindness. 2012-05-18 21:15:01 +02:00
cib a740a14fd4 Fixed a runtime. 2012-05-18 19:58:13 +02:00
caelaislinn 453ffce556 added WIP birdmen, tweaked / cleaned up gas turbine gens, tweaked lockdown computers and poddoors.
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-19 03:22:42 +10:00
cib e81316a2d4 mend 2012-05-18 19:15:02 +02:00
cib 3bf3669ffb This should enable pAIs and parasites to see emotes. 2012-05-18 18:54:26 +02:00
caelaislinn 869da0db36 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-05-19 01:19:50 +10:00
cib 5bd2508fbc Added Meme weaknesses, added more Meme verbs. 2012-05-18 16:31:40 +02:00
cib 05f3330b0c Added more meme abilities. 2012-05-18 13:46:19 +02:00
Rob Palkowski 0822991081 Grammar fix to CPR message 2012-05-18 02:44:15 -07:00
Rob Palkowski dd20605fd4 Make the message for AI mode less metagame-inspiring.
The old message was pretty much an IC "Go kill your AI now" carte
blanche.  The new one allows for a sneaky AI to actually, with care,
sneak to victory rather than trying to find the quickest way to
slaughter all staiton personnel.
2012-05-18 00:39:54 -07:00
Erthilo fa8e8decb4 Made rollerbeds collapsible. They don't fit in containers, so it's just easier to take to location. Added new sprites and sounds for cable cuffs, and new sounds for table smashy. 2012-05-18 00:56:53 +01:00
Erthilo cf6a56433b Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2012-05-18 00:46:20 +01:00
Erthilo 17fe0e9ac1 TG: -Individual dorms now have a button inside that bolts/unbolts the door
-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!
Revision: r3602
Author: 	 ericgfw...@hotmail.com
2012-05-17 22:17:02 +01:00