Commit Graph

694 Commits

Author SHA1 Message Date
Mloc
3d21ec7f5a Merge pull request #2834 from comma/tentacles
Tentacles
2013-05-26 11:49:38 -07:00
Mloc
420354d1dc Merge pull request #2860 from CIB/master
Fix to event no-repetition code
2013-05-26 11:40:42 -07:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2013-05-26 20:43:22 +02:00
meyar
30a39d580f Forgot about airlock access 2013-05-26 14:26:00 -04:00
meyar
61b7aa06ae Remembered to actually add to the changelog 2013-05-26 12:14:18 -04:00
Chinsky
f9b0ba7a49 Added lids for bottles and beakers.
Click on vessel in hand to put lid on / take it off.
Lids prevent use of syringes and spilling.
2013-05-26 06:38:38 +04:00
Chinsky
d9e21f05d0 Updated changelog 2013-05-26 05:06:10 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-05-26 05:02:07 +04:00
Erthilo
77c51235af Changelog updated and archived. 2013-05-25 22:15:42 +01:00
SkyMarshal
6c8b0c23dc Small fixes, updated changelog. 2013-05-21 23:12:47 -07:00
cib
d7cc42e588 Added wallrot event.
Also some updates to changelog.
2013-05-18 21:55:02 +02:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-16 12:21:55 +01:00
Cael_Aislinn
7c6e7d4727 changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-14 13:26:09 +10:00
cib
ad6105b380 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-05-14 01:29:45 +02:00
Mloc-Argent
27759f47df Merged master into BEF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 15:43:50 +01:00
Spamcat
15d4cc531a Removed misleading information from changelog.html
yell at me if you don't like it
2013-05-04 13:24:40 +04:00
Spamcat
02fd487008 Blood type now saves in savefile.
fixes #2738
2013-05-04 13:22:21 +04:00
Spamcat
7da39e3bfd Changelog. 2013-04-30 17:02:57 +04:00
jediluke69
d9d09f7b1d updated the Dreaded changelog 2013-04-24 20:18:15 -04:00
Chinsky
69cb68732b Merge pull request #2699 from NerdyBoy1104/bleeding-edge-freeze
Changelog update~
2013-04-24 13:24:25 -07:00
NerdyBoy1104
a710179c9d Changelog update~ includes a small typo fix to faux's recent update too. 2013-04-24 19:17:15 +01:00
NerdyBoy1104
78e934e0d0 Changelog update~ includes a fixed version of faux's changelog 2013-04-24 19:00:56 +01:00
fauxtada
a31bdfffaa changelog 2013-04-24 10:45:54 -07:00
SkyMarshal
9cf3ca497e Changeloooog~ 2013-04-18 09:58:36 -07:00
SkyMarshal
de5aec6b1d Changeloooog~ 2013-04-17 02:05:51 -07:00
Spamcat
44401cf03e Fixed blood overlays for batons. Also,changelog. 2013-04-15 22:23:09 +04:00
Asanadas
f3e1ff57d6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-04-04 01:15:03 -04:00
Spamcat
1198bc501f Changelog 2013-03-28 18:27:21 +04:00
Asanadas
f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2013-03-27 19:45:40 -04:00
Spamcat
9d916e9096 C-c-changelog! 2013-03-26 13:31:47 +04:00
Cael_Aislinn
bf9c9d219f changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 22:12:39 +10:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:37:35 +10:00
Spamcat
5bd181d405 Updated the changelog.
Better late than never, huh?
2013-03-14 17:05:17 +04:00
Christian Bielert
817996cd09 Merge pull request #2519 from comma/bleeding-edge-freeze
Small things and SNEAKING IN TG COMMITS.
2013-03-11 15:54:24 -07:00
cib
ecb08d0c46 Cloning now requires meat for biomass. 2013-03-11 18:20:02 +01:00
Chinsky
10f2ad6e2f Changelog 2013-03-11 05:02:26 +04:00
Chinsky
52ad4929d1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:43 +04:00
RavingManiac
2132e34dc4 Updated changelog. 2013-03-10 23:38:22 +08:00
Cael_Aislinn
6437e1d84e changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:40:38 +10:00
Cael_Aislinn
0173f745e9 changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:41:16 +10:00
Cael_Aislinn
ca2035da1f changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:46:30 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:23:16 +10:00
Cael_Aislinn
1fa38136c0 changelog updates, cleaned up formatting on the most recent changelog entries
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:16:56 +10:00
cib
13f65265fe Added changelog. 2013-03-05 04:30:21 +01:00
Gamerofthegame
e8e636121e Changelog 2013-02-26 22:30:53 -05:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-26 03:02:24 +10:00
Cael_Aislinn
3fcab3bf19 more changelog, boosted max shield charge rate
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:21:32 +10:00
Cael_Aislinn
13a4e0be61 changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:01:59 +10:00
Cael_Aislinn
9992b7bd44 changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 22:25:22 +10:00
Chinsky
29b1ef1c63 Derp, forgot main part of explosive implant EMP code and changelog. 2013-02-23 00:41:20 +04:00