cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,775 Commits 6 Branches 0 Tags
a765ad44e451db1ea55e47f05e63ab3d16c754ad
Commit Graph

4357 Commits

Author SHA1 Message Date
Erthilo
d8a2e17f3a Hotfix for Tajarans. Reverts tajaran.dm. Guess blend doesn't work there. Also prevent skin change workaround. 2012-05-21 12:31:33 +01:00
caelaislinn
b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 17:48:12 +10:00
caelaislinn
98c0cfeb22 probably fixed merge conflict, also updated Antiqua.dmm 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 17:44:01 +10:00
Erthilo
eb599dd33a Merge pull request #1119 from SkyMarshal/BugFixes 
Bug fixes
 2012-05-20 14:42:30 -07:00
SkyMarshal
58570a0f65 As many bugfixes as I could cram into here. 2012-05-20 14:23:10 -07:00
SkyMarshal
c8faf93e9f More Tajaran fixes, made blood-type damage not affect changelings, blood now regenerates. 2012-05-20 13:38:20 -07:00
Erthilo
f81b043787 Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb. 2012-05-20 21:37:10 +01:00
Erthilo
56db1fdff8 Adds Soghun/Tajaran whitelisting. Stick key and race into alienwhitelist.txt like so 'byondguy - Soghun' to allow soghun, etc. 2012-05-20 20:51:38 +01:00
SkyMarshal
0cebc4d1f2 Merge pull request #1116 from SkyMarshal/BugFixes 
Fixes Tajaran Transformation.  Few sanity checks and bugfixes added.
 2012-05-20 12:43:30 -07:00
Erthilo
f20e61b4ae Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-20 20:33:44 +01:00
SkyMarshal
69b6926293 Fixes Tajaran Transformation. Few sanity checks and bugfixes added. 2012-05-20 12:32:00 -07:00
Erthilo
56203680d9 Missed a list of AI verbs. Engineering jumpsuit whitespace eliminated. Half fixes holopads. You can use them, you can't move. Nutriment made less ridiculously healing. Player Mute OOC name change to be more clear. More AI camera fix. Small Tajaran examine text fix. 2012-05-20 20:09:23 +01:00
CIB
932d60d438 Merge pull request #1115 from CIB/master 
Disable meme voting
 2012-05-20 11:50:30 -07:00
cib
cb02054845 Disable meme voting for now. 2012-05-20 20:43:10 +02:00
caelaislinn
aa67c605dc fixed lockdown computer. 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 02:11:47 +10:00
CIB
17372eab8e Merge pull request #1111 from caelaislinn/da65f852b6595afe6ece0400cb2d6e8c4d4da326 
antiqua updates, numerous misc changes
 2012-05-20 07:16:32 -07:00
caelaislinn
79cb750130 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:28:18 +10:00
caelaislinn
4ffbf02569 lowered radsuits from 4 to 1 per crate 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:26:01 +10:00
caelaislinn
da65f852b6 - power monitor: a remote monitoring device to send network data to a console 
- lowered the number of radsuits per crate down to 1 (they're never used on exodus anyway)
- tweaked turbines

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:18:26 +10:00
caelaislinn
2c2bc1729d - tweaked heatshield, then removed it because of derp. 
- added some new engineering areas, worked on antiqua engineering (antiqua is now ready for - wiring).

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-20 22:16:00 +10:00
CIB
f8cab8cbd1 Merge pull request #1110 from Uristqwerty/AI-visibility-cleanup 
Ai visibility work
 2012-05-20 02:50:24 -07:00
Uristqwerty
4d86655791 Minimap works correctly with Z levels now. 2012-05-20 03:46:37 -04:00
Uristqwerty
b8158111a7 Fix for Issue #1105, second problem. 
[Oops.jpg.gif.bmp]
 2012-05-19 21:45:30 -04:00
Erthilo
8a0809b7d6 Fixes Track With Camera bug. Was probably my fault. Sorry! 2012-05-20 01:48:58 +01:00
Erthilo
2ce24412ed Lot's of grammar and spelling fixes for APC actions. 2012-05-20 00:55:38 +01:00
Erthilo
229fad369e Adds right-click verbs for pick up and closet open/close. 2012-05-20 00:25:05 +01:00
Erthilo
4d67491654 More update_clothing() calls. 2012-05-20 00:02:23 +01:00
Erthilo
9d6eb534a7 Adds confirmation to Delete Character Slot. 2012-05-19 23:01:56 +01:00
Erthilo
3582f9cb44 Normalizes AI and MMI vers, credit to @sunfall. 
Original Commit Message:
For... whatever reason, these two lists of verbs were being maintained
seperately.  @Erthilo over at BS12 made them match, but I decided to
go one further and split them out into a global list, so it only has
to be changed in a single location.

My attempt to make that list a const showed me that lists cannot
ever be const.  Which was the only reason we were still potentially
dragging around code/var/const.dm, so I nuke that here as well.

BYOND.  Sigh.
 2012-05-19 23:00:28 +01:00
Erthilo
0d84438eda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 2012-05-19 21:16:21 +01: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
Erthilo
7b3ec1bdfb TG: - Added a middleclick function that swaps your hands. 
- Some reorganization of DNA display in DNA modifiers. It's much easier to see
where blocks start and end now.
- Tried to clean up some mob stuff, mostly dead humans unnecessarily grabbing
their atmosphere.
- Made turret controls emaggeable.

I've also committed Invisty's new ending station animations. They're pretty
cool, check them out!
Revision: r3621
Author: 	 vageyenaman
 2012-05-19 19:29:13 +01: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
Uristqwerty
1b0f9daf99 Continuing... 
Moved some code around
Removed some unneeded lines
Actually compiles (A #define from the previous commit was in the wrong file)
 2012-05-19 13:31:05 -04:00
Erthilo
38c928ed85 TG: - Copied over the additional glasses from Bay 12. Includes a pair of large 
sunglasses, hipster (prescription) glasses and 'jensenshades' security HUD.
Revision: r3618
Author: 	 baloh.matevz
 2012-05-19 18:30:46 +01: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
Uristqwerty
6ff7a6c0e8 AI Visibility cleanup 
First commit:
 - Splitting files
 - Starting to add comments describbing the purpose of various procs
 2012-05-19 11:07:49 -04: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