cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-18 14:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,064 Commits 8 Branches 0 Tags
f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Commit Graph

11966 Commits

Author SHA1 Message Date
Chinsky
5071ea57ad Fix for #3583 
Hostile mobs now check adjacency before applying damage.
 2013-12-25 14:20:56 +04:00
Chinsky
9202fda78a Fixes #4028 
Makes invisimin make mob transparent instead of icon changes.
 2013-12-25 12:54:15 +04:00
Chinsky
022fdf1e19 Merge branch 'master' of https://github.com/comma/Baystation12 2013-12-25 02:47:26 +04:00
Chinsky
ab727aef11 Added link to examine shown item. 
Removed grab handler because it's an abstract item.
 2013-12-25 02:44:42 +04:00
Chinsky
7d95a385f2 No messages from beyond the grave pls. 2013-12-25 01:59:35 +04:00
Chinsky
0b670f611d Makes ash disappear on attack_hand to solve issue where paper burned inside containers would create immovable pile of ash. 
I could swear that's how ash behaved at some point, but then again, I am drunk
 2013-12-25 00:58:20 +04:00
Chinsky
c45f10f02b Merge branch 'dev-freeze' of https://github.com/comma/Baystation12 into dev-freeze 2013-12-25 00:36:35 +04:00
Chinsky
ac1c24f35c Adds ability to write on floors and walls with blood. 
Codersprites for now.
 2013-12-25 00:11:50 +04:00
Chinsky
ee6a18d94d Adds White UI to selectable UIs 2013-12-24 23:05:41 +03:00
Chinsky
e3e569593d Fixed dried blood showin up as 'dried the blood' 2013-12-24 18:47:06 +03:00
Chinsky
4cb94fbf50 Small pefomance boost for drying blood. 
Now using colors instead of icon procs.
 2013-12-24 09:33:00 +03:00
Chinsky
ddcc5386eb Adds verb similar to ID showing capability for quick showing item in active hand. 2013-12-24 09:49:23 +04:00
Mloc
0ff0004250 Merge pull request #4112 from fauxki/dev 
Sprite Bug Fixes
 2013-12-23 15:36:02 -08:00
DJSnapshot
782acc97cf Merge pull request #4103 from LightningIron/dev 
Removed R&D lockboxes.
 2013-12-23 15:25:17 -08:00
fauxki
28340d01ab #4108 - mispelling was preventing it from showing up. 2013-12-23 14:53:46 -08:00
Chinsky
bca1aa5bd4 Merge pull request #4096 from fauxki/dev 
RD Closet Changes
 2013-12-23 04:39:46 -08:00
Chinsky
6630a046c9 Merge pull request #4095 from DJSnapshot/dev-freeze 
Misc Fixes to guns
 2013-12-23 04:38:44 -08:00
Zuhayr
72727e58d5 Forgot a tilde. 2013-12-23 11:18:00 +10:30
Zuhayr
28df8b73b2 Added deactivate() for midget power. 2013-12-23 11:15:29 +10:30
Zuhayr
cc1c1e2973 Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff. 2013-12-23 10:36:36 +10:30
Ccomp5950
8e518cb4a9 Vending Machine PIN fix. 
Removed requirement for PIN on vending machines with an easy way of adding it back in the future
or setting machines to not use it or use it depending on what we decide later on.

Someone attempted to make it where it would accept any PIN and this is just as annoying as typing in a PIN.

So...space communism, swipe your card and it spits out an item.  No PIN prompt at all.
 2013-12-22 16:40:11 -06:00
LightningIron
cb3e39c476 Removed R&D lockboxes. 2013-12-22 13:29:28 -06:00
Chinsky
4c4ee3eae5 Counting on machine controller to set uid was foolish of me. 2013-12-22 23:14:23 +04:00
Chinsky
94e94dfa5d Adds gun cabinets - special snowflake secure closets. 
Specialness is that icon of closed cabinet depends on if there are guns in it, and their type.
 2013-12-22 23:10:22 +04:00
Ccomp5950
fb78caf9a5 Fixes Power Grid checks killing the AI's SMES. 
Added the turrent protected check to restore_power() that is already in power_failure()
 2013-12-22 08:38:26 -06:00
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30
Mloc
cd9c933111 Merge pull request #4088 from comma/signs 
Adds signs pointing where department is.
 2013-12-22 05:32:07 -08:00
Zuhayr
197d4993cf Merge pull request #4087 from comma/nostalgy 
Revisiting my first commits.
 2013-12-22 05:28:35 -08:00
Ccomp5950
befb623417 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanoUI_pda 2013-12-22 07:01:15 -06:00
Zuhayr
d783fd5043 Manual binary merge of head icons. 2013-12-22 23:23:25 +10:30
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Ccomp5950
ec7921909f NANOUI PDA 
Creates NanoUI for the PDA and Syndicate Uplink.

New features:
	Crew manifest now sorted with department heads at the top.
	Can select individual conversations and delete individual conversations among PDA's
	Powernet Monitor much more simple now and easier to read.
	Janitorial supplies locator now includes Janicart.
	Items will actually refresh if you click "Refresh"

Some other changes:
	Captain's PDA cartridge now has all access (added janitor access and quartermaster access)
	With the conversation change I had to change how tnote (the variable that holds PDA messages works.
		Setup the message server to use the new methods.
	Removed procs that will no longer be used (UI generation procs from old UI methods)
	Commented everything the best I can.
	Created HORRIBLE, TERRIBLE lists.  But it's pretty much required because that's how nanoUI rolls.
	Created a variable on the uplink called NanoUI items, this list is created upon creation of the
		uplink.

	I included the functionality for Mimes and Clowns for our downstream servers that have those.
 2013-12-22 06:18:39 -06:00
fauxki
a6aa087e00 Places RD Alt uniform, RD dress, and leather shoes in RD closet. 2013-12-22 04:17:46 -08:00
fauxki
a2f6d7919a Removes RD dress from here, it's to be moved as a subsection of the RD unifrom. 2013-12-22 04:16:56 -08:00
fauxki
08758cfd6a Adds in new alt RD uniform, as well as moves the RD Dress from the dress section to a subsection of RD uniform. 2013-12-22 04:16:24 -08:00
DJSnapshot
1324be7189 Fix for guns eating empty magazines. 2013-12-21 23:15:36 -08:00
DJSnapshot
2f0b5e31f4 Fix so magazines read correctly on the Colt M1911. 
Also notice for when the clip falls out.
 2013-12-21 22:58:24 -08:00
Chinsky
a498de8356 Fixes #4075 
Cannot turn around while unconscious or dead now.
 2013-12-22 08:49:42 +04:00
Chinsky
19c83de6af Applying Minifix to Yinaderp 
ID of resulting chemical was not set, so reagents just disappeared
 2013-12-22 07:55:03 +04:00
Chinsky
68b51d3188 Guest pass does not require to be processed anymore. 
Also agent IDs cannot copy access off them now (I think it would make them too powerful)
 2013-12-22 07:53:17 +04:00
Chinsky
3604986aff Merge pull request #4081 from fauxki/dev 
Gentleman's Outfit for wizard.
 2013-12-21 19:45:38 -08:00
LightningIron
81df1a1307 Removes lockboxes. 2013-12-21 17:53:19 -06:00
alex-gh
a48100da74 Reattaching a mindless head no longer results in a runtime error 2013-12-21 22:50:13 +01:00
Zuhayr
b6fed55fcd Merge pull request #4086 from Ravensdale/player_age 
Player age restriction tweak
 2013-12-21 08:06:26 -08:00
Ravensdale
9d9c797135 changes pushed to master branch instead of dev 2013-12-21 07:31:43 -08:00
RavingManiac
b26492e66d Simplified the monkey pulling check as per Giacom's suggestion. 2013-12-21 13:51:06 +08:00
Ravensdale
95ac40a04a Re-balancing for IB, bleed rate is back to usual settings, minor nerf for 
appendicitis initial bleed rate, harder to get IB.
 2013-12-20 17:01:51 -08:00
fauxki
ad41957f9d Puts in a gray flatcap for the wizard. 
Adds in a fancy long jacket for him too.
 2013-12-20 16:59:24 -08:00
fauxki
7c695eb9ba Adds in the gentleman's suit for the gentlemanly wizard. 2013-12-20 16:58:34 -08:00